usergrid git commit: Removed automatically added header

Repository: usergrid Updated Branches: refs/heads/USERGRID-1051 78bc3d5c0 -> 6c502aa35 Removed automatically added header Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/6c502aa3 Tree: http://git-wip-us.apache.org/re

usergrid git commit: Changed how the use of UnsupportedException to be only in core and added a new UnsupportedRestException error that is to be used in the rest tier. Confirmed it is now thrown in th

Repository: usergrid Updated Branches: refs/heads/USERGRID-767 783c58403 -> f563a8d05 Changed how the use of UnsupportedException to be only in core and added a new UnsupportedRestException error that is to be used in the rest tier. Confirmed it is now thrown in the correct cases Project: h

[31/35] usergrid git commit: Fix inheritance issue.

Fix inheritance issue. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/78727e18 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/78727e18 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/78727e18 Bra

[18/35] usergrid git commit: Implement a minimum lock expiration time.

Implement a minimum lock expiration time. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/4945b6f2 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/4945b6f2 Diff: http://git-wip-us.apache.org/repos/asf/usergrid

[22/35] usergrid git commit: Only reset roles and application secrets if the create application request is not for a migration.

Only reset roles and application secrets if the create application request is not for a migration. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/f9028b24 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/f902

[28/35] usergrid git commit: Merge branch 'release'

Merge branch 'release' Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/ceae7db5 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/ceae7db5 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/ceae7db5 Bra

[05/35] usergrid git commit: Copy in just the tools changes from the master branch.

Copy in just the tools changes from the master branch. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/e38ee3e9 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/e38ee3e9 Diff: http://git-wip-us.apache.org/repos

[16/35] usergrid git commit: Merge branch 'release' of https://git-wip-us.apache.org/repos/asf/usergrid into release

Merge branch 'release' of https://git-wip-us.apache.org/repos/asf/usergrid into release Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/4e048f32 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/4e048f32 Diff:

[03/35] usergrid git commit: Remove unused zookeeper lock manager.

Remove unused zookeeper lock manager. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/8849d8eb Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/8849d8eb Diff: http://git-wip-us.apache.org/repos/asf/usergrid/dif

[19/35] usergrid git commit: Merge commit '19de00b5b72859ddceeea01bedc94c0cc2efaeb4' into release

Merge commit '19de00b5b72859ddceeea01bedc94c0cc2efaeb4' into release * commit '19de00b5b72859ddceeea01bedc94c0cc2efaeb4': Fix tests to handle uniqueness of fields being indexed at Elasticsearch (before assumed duplicates were allowed). Initial work to support a typed null field for an entity,

[23/35] usergrid git commit: Cleanup duplicate edges at the end of addToCollection and filter duplicate edges in our graph results.

Cleanup duplicate edges at the end of addToCollection and filter duplicate edges in our graph results. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/62ad5a84 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/

[30/35] usergrid git commit: Merge branch 'release'

Merge branch 'release' Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/8ed5a24a Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/8ed5a24a Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/8ed5a24a Bra

[27/35] usergrid git commit: Merge branch 'release' of https://git-wip-us.apache.org/repos/asf/usergrid into release

Merge branch 'release' of https://git-wip-us.apache.org/repos/asf/usergrid into release Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/46fb9265 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/46fb9265 Diff:

[12/35] usergrid git commit: Remove unused SingleNodeLockImpl and any references to this.

Remove unused SingleNodeLockImpl and any references to this. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/0071df0e Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/0071df0e Diff: http://git-wip-us.apache.org

[06/35] usergrid git commit: First commit of new implementation of Astyanax locks and having it wired with guide instead of Spring.

First commit of new implementation of Astyanax locks and having it wired with guide instead of Spring. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/71f32747 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/

[33/35] usergrid git commit: Merge branch 'release'

Merge branch 'release' Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/40be90f5 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/40be90f5 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/40be90f5 Bra

[34/35] usergrid git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/usergrid into USERGRID-1047

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/usergrid into USERGRID-1047 # By Michael Russo (19) and Dave Johnson (4) # Via Michael Russo (4) and others * 'master' of https://git-wip-us.apache.org/repos/asf/usergrid: (23 commits) Fix issue with null values nested in an entit

[32/35] usergrid git commit: Fix issue with null values nested in an entity list field being represented as a top-level entity NullField instead of a null value.

Fix issue with null values nested in an entity list field being represented as a top-level entity NullField instead of a null value. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/595955df Tree: http://git-wip-us.apach

[14/35] usergrid git commit: Fix tests to handle uniqueness of fields being indexed at Elasticsearch (before assumed duplicates were allowed).

Fix tests to handle uniqueness of fields being indexed at Elasticsearch (before assumed duplicates were allowed). Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/19de00b5 Tree: http://git-wip-us.apache.org/repos/asf/use

[29/35] usergrid git commit: Fix issue with multiple types within a list causing class cast exceptions.

Fix issue with multiple types within a list causing class cast exceptions. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/2e37c211 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/2e37c211 Diff: http://git-wip

[02/35] usergrid git commit: Fix typo in word 'tenant'.

Fix typo in word 'tenant'. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/56eb80f8 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/56eb80f8 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/56eb80f8

[09/35] usergrid git commit: Fix Astyanax locking to be re-entrant as Hector locks were and possible UG code expects it to be. Remove all reference of Hector locks, changing its existing test to work

Fix Astyanax locking to be re-entrant as Hector locks were and possible UG code expects it to be. Remove all reference of Hector locks, changing its existing test to work with Astyanax. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf

[01/35] usergrid git commit: Fix typo in word 'tenant'.

Repository: usergrid Updated Branches: refs/heads/USERGRID-1047 d97f6e3c5 -> e7d2d9257 http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationV2Impl.java --

[26/35] usergrid git commit: Revert ""port" tools from master"

Revert ""port" tools from master" This reverts commit e5ebb375386f34b2ad8883c28701500b59208a81. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/7689f771 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/7689f77

[08/35] usergrid git commit: Remove commented, old Hector configuration from Spring context config.

Remove commented, old Hector configuration from Spring context config. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/d1c1d01f Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/d1c1d01f Diff: http://git-wip-us.

[35/35] usergrid git commit: Made two changes, since AmazonclientException is a runtime exception it gets caught without needing the other catch. Also removed other 500 catch in tests and verified tha

Made two changes, since AmazonclientException is a runtime exception it gets caught without needing the other catch. Also removed other 500 catch in tests and verified that they pass locally. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repo

[15/35] usergrid git commit: Fixes to allow ImportAdmin to run in distributed env, also remove org-merge from ImportAdmins.

Fixes to allow ImportAdmin to run in distributed env, also remove org-merge from ImportAdmins. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/b22ac656 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/b22ac656

[13/35] usergrid git commit: Initial work to support a typed null field for an entity, including a new index field type named "null" with value of null. Also changes to pass a Set to elasticsearch for

Initial work to support a typed null field for an entity, including a new index field type named "null" with value of null. Also changes to pass a Set to elasticsearch for fields to index instead of a non unique list. Conflicts: stack/corepersistence/model/src/main/java/org/apache/user

[10/35] usergrid git commit: Simplify the locks consistency level and default it to LQ in case something passed cannot be parsed to a valid consistency level.

Simplify the locks consistency level and default it to LQ in case something passed cannot be parsed to a valid consistency level. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/56850926 Tree: http://git-wip-us.apache.o

[07/35] usergrid git commit: Fix new lock manager wiring issues in services layer.

Fix new lock manager wiring issues in services layer. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/8ddc7d98 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/8ddc7d98 Diff: http://git-wip-us.apache.org/repos/

[11/35] usergrid git commit: Only create new client secrets during app creation if the application UUID is not provided (otherwise you overwrite existing app credentials).

Only create new client secrets during app creation if the application UUID is not provided (otherwise you overwrite existing app credentials). Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/38b6b88a Tree: http://git-wi

[21/35] usergrid git commit: Fix the default consistency level settings in properties. The fig (e.g. CassandraFig) will only use its default if there was no java prop set already.

Fix the default consistency level settings in properties. The fig (e.g. CassandraFig) will only use its default if there was no java prop set already. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/e03354f6 Tree: http

[20/35] usergrid git commit: Merge commit '4945b6f2d3a8a2d6e78c230bce6be09082dfa68c'

Merge commit '4945b6f2d3a8a2d6e78c230bce6be09082dfa68c' * commit '4945b6f2d3a8a2d6e78c230bce6be09082dfa68c': Implement a minimum lock expiration time. Ensure the lock manager is injected as a singleton. Remove unused SingleNodeLockImpl and any references to this. Simplify the locks consist

[17/35] usergrid git commit: Ensure the lock manager is injected as a singleton.

Ensure the lock manager is injected as a singleton. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/289cc97c Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/289cc97c Diff: http://git-wip-us.apache.org/repos/as

[24/35] usergrid git commit: Merge branch 'release'

Merge branch 'release' Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/c4813b5f Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/c4813b5f Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/c4813b5f Bra

[25/35] usergrid git commit: "port" tools from master

"port" tools from master Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/e5ebb375 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/e5ebb375 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/e5ebb375 B

[04/35] usergrid git commit: Copy in just the tools changes from the master branch.

http://git-wip-us.apache.org/repos/asf/usergrid/blob/e38ee3e9/stack/tools/src/main/java/org/apache/usergrid/tools/ImportAdmins.java -- diff --git a/stack/tools/src/main/java/org/apache/usergrid/tools/ImportAdmins.java b/stack/too

[08/14] usergrid git commit: ElasticsearchException added so we return 503's if we don't do GETs.

ElasticsearchException added so we return 503's if we don't do GETs. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/78bc3d5c Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/78bc3d5c Diff: http://git-wip-us.ap

[13/14] usergrid git commit: Merge commit 'refs/pull/457/head' of github.com:apache/usergrid

Merge commit 'refs/pull/457/head' of github.com:apache/usergrid Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/6c08e29c Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/6c08e29c Diff: http://git-wip-us.apache.

[11/14] usergrid git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/usergrid into USERGRID-1047

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/usergrid into USERGRID-1047 # By Michael Russo (19) and Dave Johnson (4) # Via Michael Russo (4) and others * 'master' of https://git-wip-us.apache.org/repos/asf/usergrid: (23 commits) Fix issue with null values nested in an entit

[04/14] usergrid git commit: Added additional test, and verified that they all throw their kind of exceptions but they get mapped to NotAllowed for whatever reason.

Added additional test, and verified that they all throw their kind of exceptions but they get mapped to NotAllowed for whatever reason. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/783c5840 Tree: http://git-wip-us.ap

[10/14] usergrid git commit: Changed how the use of UnsupportedException to be only in core and added a new UnsupportedRestException error that is to be used in the rest tier. Confirmed it is now thro

Changed how the use of UnsupportedException to be only in core and added a new UnsupportedRestException error that is to be used in the rest tier. Confirmed it is now thrown in the correct cases Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/r

[07/14] usergrid git commit: Fixed assets tests and fixed oversight of not updating entity metadata for AWS binary assets. Also changed tests so they will run with properties set the way its done occa

Fixed assets tests and fixed oversight of not updating entity metadata for AWS binary assets. Also changed tests so they will run with properties set the way its done occasionally. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/userg

[02/14] usergrid git commit: Modified excess code and removed it.

Modified excess code and removed it. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/a0b8b034 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/a0b8b034 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff

[12/14] usergrid git commit: Made two changes, since AmazonclientException is a runtime exception it gets caught without needing the other catch. Also removed other 500 catch in tests and verified tha

Made two changes, since AmazonclientException is a runtime exception it gets caught without needing the other catch. Also removed other 500 catch in tests and verified that they pass locally. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repo

[05/14] usergrid git commit: Added test that verify that doing a get on an asset will now return on 404 and added AmazonException throwing for reading.

Added test that verify that doing a get on an asset will now return on 404 and added AmazonException throwing for reading. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/dae82542 Tree: http://git-wip-us.apache.org/repo

[01/14] usergrid git commit: Added fixes for USERGRID-767 and added tests looking for cases that would previously cause uncaught exception errors.

Repository: usergrid Updated Branches: refs/heads/master 40be90f5e -> 949105226 Added fixes for USERGRID-767 and added tests looking for cases that would previously cause uncaught exception errors. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache

[09/14] usergrid git commit: Removed automatically added header

Removed automatically added header Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/6c502aa3 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/6c502aa3 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/6

[06/14] usergrid git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/usergrid into USERGRID-1047

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/usergrid into USERGRID-1047 # Via Dave Johnson (1) and George Reyes (1) * 'master' of https://git-wip-us.apache.org/repos/asf/usergrid: Added apache header to testing text. Fun fact time: The apache header adds 803 bytes unto eve

[14/14] usergrid git commit: Merge commit 'refs/pull/470/head' of github.com:apache/usergrid

Merge commit 'refs/pull/470/head' of github.com:apache/usergrid Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/94910522 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/94910522 Diff: http://git-wip-us.apache.

[2/7] usergrid git commit: USERGRID-1200: workflow URL refactor

USERGRID-1200: workflow URL refactor 1. Add usergrid.api.url.base property (defaults to http://localhost:8080/ROOT) that can be overridden for an org. 2. The confirmation and activation properties are hardcoded paths and don't need org overrides. Example: usergrid.admin.activation.url is built b

[3/7] usergrid git commit: Merge remote-tracking branch 'origin/master' into USERGRID-1200

Merge remote-tracking branch 'origin/master' into USERGRID-1200 Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/a33698b1 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/a33698b1 Diff: http://git-wip-us.apache.

[03/14] usergrid git commit: Added some additional logging to point to places where this error might occur.

Added some additional logging to point to places where this error might occur. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/b1535916 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/b1535916 Diff: http://git

[6/7] usergrid git commit: USERGRID-1200: fix test

USERGRID-1200: fix test Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/445ff5e5 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/445ff5e5 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/445ff5e5 Br

[1/7] usergrid git commit: USERGRID-1200: workflow URL refactor

Repository: usergrid Updated Branches: refs/heads/master 949105226 -> 21ba17e45 http://git-wip-us.apache.org/repos/asf/usergrid/blob/90d5d665/stack/services/src/main/java/org/apache/usergrid/management/OrganizationConfigProps.java

[5/7] usergrid git commit: Merge remote-tracking branch 'origin/master' into USERGRID-1200

Merge remote-tracking branch 'origin/master' into USERGRID-1200 Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/f6c8b853 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/f6c8b853 Diff: http://git-wip-us.apache.

[7/7] usergrid git commit: Merge commit 'refs/pull/469/head' of github.com:apache/usergrid

Merge commit 'refs/pull/469/head' of github.com:apache/usergrid Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/21ba17e4 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/21ba17e4 Diff: http://git-wip-us.apache.

[4/7] usergrid git commit: USERGRID-1200: bug fixes and tests

USERGRID-1200: bug fixes and tests 1. Fix copying of Properties object (requires constructor + putAll() ) 2. Fix property retrieval for org-configurable properties (take from org properties first, then config file properties, then org property defaults. 3. Added 2 tests for new org config functio

[1/2] usergrid git commit: USERGRID-1237 - Update links in iOS SDK README

Repository: usergrid Updated Branches: refs/heads/master 21ba17e45 -> 37d78ab9a USERGRID-1237 - Update links in iOS SDK README Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/dfac0ca5 Tree: http://git-wip-us.apache.o

[2/2] usergrid git commit: Merge commit 'refs/pull/471/head' of github.com:apache/usergrid

Merge commit 'refs/pull/471/head' of github.com:apache/usergrid Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/37d78ab9 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/37d78ab9 Diff: http://git-wip-us.apache.

[usergrid] Git Push Summary

Repository: usergrid Updated Tags: refs/tags/2.1.0 [created] 1a795d823

usergrid git commit: adding apache headers to files that didn't have it

Repository: usergrid Updated Branches: refs/heads/master 37d78ab9a -> 4610eed26 adding apache headers to files that didn't have it Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/4610eed2 Tree: http://git-wip-us.apac

usergrid git commit: USERGRID-1200: EmailFlowIT fix

Repository: usergrid Updated Branches: refs/heads/master 4610eed26 -> 586dad080 USERGRID-1200: EmailFlowIT fix Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/586dad08 Tree: http://git-wip-us.apache.org/repos/asf/use