Jonathan Shook 680ff3b3f8 Merge branch 'listfuncs' ... # Conflicts: # activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutActivity.java # docsys/src/main/resources/docs-for-docsys/docsys/design/topics.md # virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataComposer.java # virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringBindingsTemplate.java # virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListHashed.java # virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListSized.java # virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListSizedHashed.java # virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListSizedStepped.java # virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListStepped.java		2020-04-23 16:21:28 -05:00
..
bundled_docs.md	document doc content services	2020-04-20 02:03:32 -05:00
docsys.md	document doc content services	2020-04-20 02:03:32 -05:00
dynamic_endpoints.md	Merge branch 'listfuncs'	2020-04-23 16:21:28 -05:00
INDEX.md	document doc content services	2020-04-20 02:03:32 -05:00
inspirations.md	Merge branch 'listfuncs'	2020-04-23 16:21:28 -05:00