Merge branch 'key-row-sharding' into es-client-changes

Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/37d85984
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/37d85984
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/37d85984

Branch: refs/heads/es-client-changes
Commit: 37d8598476811d8211682513cf85abd6f1cca38a
Parents: 278dfca c02e77e
Author: Todd Nine <[email protected]>
Authored: Fri Oct 31 10:30:46 2014 -0600
Committer: Todd Nine <[email protected]>
Committed: Fri Oct 31 10:30:46 2014 -0600

----------------------------------------------------------------------
 .../src/test/resources/logback-test.xml         | 35 +++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


Reply via email to