GitHub user tnine opened a pull request:
https://github.com/apache/incubator-usergrid/pull/71
Usergrid 188
Adds shard rolling logic to graph with edge timestamps
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/apache/incubator-usergrid USERGRID-188
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-usergrid/pull/71.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #71
----
commit 22df31b0cd6d9dc049b02f8c257daa8574b41303
Author: Furkan Bicak <[email protected]>
Date: 2014-06-12T13:18:14Z
Show chop coordinator logs on coordinator user interface
commit 260955b76a81e79f70f6041e2c76d5d3e5e2bb2d
Author: Yigit Sapli <[email protected]>
Date: 2014-06-12T14:29:16Z
Merge pull request #193 from fbicak/two-dot-o
Chain Chop Plugin Goals and Add Style Checking Plugin
commit 8e999504f052554f0a84f21a256b695ea5f91206
Author: Dave Johnson <[email protected]>
Date: 2014-06-12T14:46:05Z
Fix to getContainers() in CpRelationManager.
commit 54b6d247a155af390fd1121e531dc1711f022060
Author: Dave Johnson <[email protected]>
Date: 2014-06-12T14:46:11Z
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into
two-dot-o
commit 3e96f797debc7d6c2b37b72fed1b66e2f9746fa4
Author: grey <[email protected]>
Date: 2014-06-12T15:35:57Z
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into
USERGRID-165_fix-exports-tests
# By Furkan Bicak (5) and Dave Johnson (2)
# Via Dave Johnson (2) and others
* 'two-dot-o' of https://github.com/usergrid/usergrid:
Fix to getContainers() in CpRelationManager.
Show chop coordinator logs on coordinator user interface
Fix CollectionIT.testGroups().
Code refactoring
Enable RunnerMojo to be called from other Mojos
Chaining chop maven plugin goals
Adding maven checkstyle plugin
Conflicts:
stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
commit a00c34cf8fe2a37b20197d4a184dd1a170538817
Author: Furkan Bicak <[email protected]>
Date: 2014-06-12T15:39:14Z
Code refactoring
commit 67290f94ea2c35db9950d282846f8a74aec2897c
Author: Dave Johnson <[email protected]>
Date: 2014-06-12T17:44:47Z
Fix for remaining Core module tests and removing some redundant tests.
commit e77e93537d474128bc883c2ea00ae6586a63609c
Author: grey <[email protected]>
Date: 2014-06-12T19:11:39Z
Passing 4 of 8 tests for export.
commit df918f85477fd0888088a10a99ee6bb9ac3082d8
Author: grey <[email protected]>
Date: 2014-06-12T19:38:12Z
Fixes for all the export tests
commit 47012826997e3625eaeda3bb5b7591c01723e394
Author: grey <[email protected]>
Date: 2014-06-12T19:41:35Z
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into
USERGRID-165_fix-exports-tests
# By Dave Johnson
# Via Dave Johnson
* 'two-dot-o' of https://github.com/usergrid/usergrid:
Fix for remaining Core module tests and removing some redundant tests.
Conflicts:
stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
commit 3255b04147eee771f472507721a05e5f9b166aa1
Author: Dave Johnson <[email protected]>
Date: 2014-06-13T11:50:20Z
Minor logging changes.
commit 34c451d562c2da09dd296f6c2d5666845c404f1d
Author: grey <[email protected]>
Date: 2014-06-13T14:47:29Z
Tore out the fasterxml jackson libs and exchanged them for codehaus libs.
commit b6364bd9fef0d2dfffbe40dc787a231972694e88
Author: Dave Johnson <[email protected]>
Date: 2014-06-13T14:58:48Z
Merge pull request #202 from GERey/Changing_jackson_versions
Changing jackson versions back to Codehaus version due to version
compatibility problems.
Thanks George!
commit 3df612710840e3aabfd8361aa5cc228c28fb3021
Author: grey <[email protected]>
Date: 2014-06-13T17:30:09Z
Changed the code to highlight the byte buffer error that exists.
commit a9f4643e07ee20fb4a5a021611b292976919e2ed
Author: grey <[email protected]>
Date: 2014-06-13T20:41:53Z
Tore out more of the fasterxml libs. The only existing ones focus on UUID
generation and do not affect the serialization.
commit c1127f92c7d05ec71ad432989d267f9c0ea992ce
Author: grey <[email protected]>
Date: 2014-06-13T21:10:40Z
Fixed byte buffer error message.
commit d7c5782ac949e1a886bb4d1bde4ed91f063b2934
Author: Salih Kardan <[email protected]>
Date: 2014-06-14T08:36:05Z
Merge remote-tracking branch 'upstream/two-dot-o' into two-dot-o
commit 0e30a317285a3a9373c456b418d2941ac568c7b4
Author: Salih Kardan <[email protected]>
Date: 2014-06-14T09:06:59Z
adding logout button to coordinator ui
commit 531141093d2c31cc3c4b67e0eaa9cddc8bb9ca8c
Author: Yigit Sapli <[email protected]>
Date: 2014-06-14T16:18:44Z
Merge pull request #194 from salihkardan/two-dot-o
convert JSONArray into string before saving results to ES
commit b75cd30c0c3d8dbb24488b0168e9caf3eadbd203
Author: Salih Kardan <[email protected]>
Date: 2014-06-15T17:01:42Z
Merge remote-tracking branch 'upstream/two-dot-o' into two-dot-o
commit 04d2839ffcd5e46e87046983be21f6260eb43d3d
Author: Furkan Bicak <[email protected]>
Date: 2014-06-16T05:21:47Z
Remove test artifacts
commit 4ce155d2a87b0e041d372744af8fe84ef18cd1a0
Author: Yigit Sapli <[email protected]>
Date: 2014-06-16T10:37:40Z
Merge pull request #204 from fbicak/two-dot-o
Remove Test Artifacts of Example Project
commit fc0dd40bbb1ca48923b8ccc1423daebee060adcd
Author: Salih Kardan <[email protected]>
Date: 2014-06-16T13:37:03Z
adding login screen to coordinator web ui and logout button to main view
commit 41b0551d90ac4081e189618a8a27ed6b944c7d63
Author: Salih Kardan <[email protected]>
Date: 2014-06-16T13:38:53Z
editing shiro authentication method
commit f6ec1ea6a6192042a1a9742838db9a6e1e2d17b4
Author: Dave Johnson <[email protected]>
Date: 2014-06-16T14:30:33Z
Merge pull request #203 from GERey/Changing_jackson_versions
Changing jackson versions
commit b7a88d9fc0637c0114ddc0a810917dce7c9af2f4
Author: grey <[email protected]>
Date: 2014-06-16T15:26:48Z
Removed the Thread.sleep(1000) from almost all of the tests.
testExportOneOrganization needs the thread.sleep due to the number of
entities it creates, and to let the writes be committed.
commit a44051c14f854c61db4624c42cd6fbb3ac4a017e
Author: Salih Kardan <[email protected]>
Date: 2014-06-16T16:14:29Z
code refactoring
commit 3749d7ba1046e884fc565bcf322d141be2202640
Author: Salih Kardan <[email protected]>
Date: 2014-06-16T16:17:16Z
Merge remote-tracking branch 'upstream/two-dot-o' into two-dot-o
commit 2ad0f28f1ec361900792bc5afe7f4e8dae562cf9
Author: Dave Johnson <[email protected]>
Date: 2014-06-16T16:49:57Z
Use Codehause Jackson compatible @JsonAnyGetter and @JsonAnySetter.
commit b46d099f418e5e1221d6c43927397270271bf601
Author: Dave Johnson <[email protected]>
Date: 2014-06-16T18:31:24Z
Replace ByteBufferField with ByteArrayField because you cannot instantiate
a ByteBuffer.
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
