Skip to content
This repository was archived by the owner on Aug 20, 2025. It is now read-only.
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2379 commits
Select commit Hold shift + click to select a range
ed4e67c
Improvements to error handling in cache key generation
snoopdave May 23, 2016
8ebc28d
Merge branch 'release-2.1.1' into usegrid-1283-mgmt-app-init
snoopdave May 24, 2016
b03f6a9
Revert "Adding distinctive logging, also: no longer wrap RuntimeExcep…
snoopdave May 24, 2016
0970e1d
Revert "Service manager's init() method now retries if unable to get …
snoopdave May 24, 2016
6daba1d
Merge branch 'release-2.1.1' into usergrid-1283-mgmt-app-init
snoopdave May 25, 2016
7d2de99
Revert all changes to ServiceManager
snoopdave May 25, 2016
e299024
Revert all changes to CpEntityManager
snoopdave May 25, 2016
b0fba68
Revert all changes to CpEntityManager
snoopdave May 25, 2016
ba10e7f
Revert all changes to CpEntityManagerFactory
snoopdave May 25, 2016
910811d
Add retry logic and logging in AstyanaxLockManagerImpl and CpEntityMa…
snoopdave May 25, 2016
fcd00e8
Make retries and interval configurable
snoopdave May 25, 2016
61a35a0
Made max-retries and intervals configurable for both lock manager and…
snoopdave May 26, 2016
6fadf80
Merge branch 'release-2.1.1' into usergrid-1268-akka-211
snoopdave May 27, 2016
59c538a
Move LockManager setup into normal setup regime, don't cache EntityMa…
snoopdave May 31, 2016
151abf7
Merge branch 'release-2.1.1' into select-mappings-nested
snoopdave May 31, 2016
5452d68
Ensure that field names are treated consistently and in a case-insens…
snoopdave Jun 1, 2016
e9228e1
Tests to illustrate case-insensitive handling of Entity field names.
snoopdave Jun 2, 2016
4b8e546
Remove unneeded properties, log when mgmt app lookup fails, minor ref…
snoopdave Jun 3, 2016
317714b
Additional test.
snoopdave Jun 3, 2016
8976b41
Merge commit 'refs/pull/528/head' of github.com:apache/usergrid into …
Jun 3, 2016
a1cb1f5
Merge commit 'refs/pull/532/head' of github.com:apache/usergrid into …
Jun 3, 2016
e6cf6ed
Merge commit 'refs/pull/518/head' of github.com:apache/usergrid into …
Jun 3, 2016
17809ac
Quick fix for Core tests: ensure lockManager gets initialized.
snoopdave Jun 3, 2016
66bb5cd
Quick fix for Service tests: ensure lockManager gets initialized.
snoopdave Jun 3, 2016
7143cba
USERGRID-1295 - Re-introduce a more efficient de-index upon entity de…
Jun 4, 2016
b3e60c9
better logging
snoopdave Jun 6, 2016
fcb347c
core schema manager needs injector now
snoopdave Jun 6, 2016
cc7a867
Separate create vs. get column family logic.
snoopdave Jun 6, 2016
48780f0
Only execute read repair delete batch if there are no rows to delete.
Jun 6, 2016
38909ad
Merge commit 'refs/pull/534/head' of github.com:apache/usergrid into …
Jun 6, 2016
cb90c0b
Add docs for application delete and restore.
snoopdave Jun 6, 2016
0eaea98
bug fix - When cursor queryparam is passed in with an empty value the…
ayesha12 Jun 6, 2016
324ef35
Add docs for Collection Settings & Selective Indexing.
snoopdave Jun 7, 2016
72c9df1
Merge commit 'refs/pull/517/head' of github.com:apache/usergrid into …
Jun 7, 2016
3df0779
Additional enhancements to cursor validation and error messages.
Jun 7, 2016
a93cad8
Merge branch 'release-2.1.1' of https://git-wip-us.apache.org/repos/a…
snoopdave Jun 14, 2016
de24373
Fix merge problem and ensure entityManagers is created before use
snoopdave Jun 14, 2016
7af4f84
Update event handling to better handle case when no index requests ar…
Jun 14, 2016
7ea48c2
USERGRID-1300: localhost superuser setting
Jun 14, 2016
4bf7761
Merge commit 'refs/pull/537/head' of github.com:apache/usergrid into …
Jun 15, 2016
8814a14
Fix logging statement.
Jun 15, 2016
29c287b
Add Pivotal Cloud Foundry source for creating Usergrid Tile ( CF depl…
Jun 15, 2016
f212608
Merge branch 'release-2.1.1'
Jun 15, 2016
de6ecb9
Revert "USERGRID-1300: localhost superuser setting"
Jun 15, 2016
8024168
USERGRID-1300: move superuser localhost check into SecuredResourceFil…
Jun 16, 2016
57089ee
Add additional logging around read repair to assist in troubleshooting.
Jun 16, 2016
b4a7068
Some field types are never allowed to be unique.
snoopdave Jun 16, 2016
cfb188d
Some field types are never allowed to be unique.
snoopdave Jun 16, 2016
f015c92
Don't provide defaults for fields that can't have reasonable defaults.
snoopdave Jun 16, 2016
b90985c
Add missing ASL header.
snoopdave Jun 16, 2016
e0d95bf
Use Guice magic instead of trying to serialize UniqueValueTable as an…
snoopdave Jun 16, 2016
0c5deac
Kludgy work-around to avoid serializing injector, which is impossible.
snoopdave Jun 17, 2016
58fc657
Fix authoritative region logic and add property for specifying the sy…
snoopdave Jun 17, 2016
4394a20
Minor improvements to tests.
snoopdave Jun 17, 2016
97aec4d
auth region is required now
snoopdave Jun 18, 2016
6455120
auth region is required now
snoopdave Jun 18, 2016
f4599fb
Add additional trace logging around unique values for troubleshooting…
Jun 20, 2016
9efa3b4
Add additional logging and rx error handling.
Jun 20, 2016
ee18950
Unique values test passes with new "actor system" module
snoopdave Jun 21, 2016
50312ba
Getting more tests working with new actorsystem module.
snoopdave Jun 21, 2016
343ac51
Separate configs for JUnit test JVM and Tomcat JVM, and remove some u…
snoopdave Jun 21, 2016
06f77d7
Add new tool for scanning unique values. Include option to skip read…
Jun 21, 2016
1997b57
Allow tools to always be built, but skip its tests for now. Also fix…
Jun 3, 2016
fb1d78d
Move cluster-singleton router config into RouterProducer and out of a…
snoopdave Jun 22, 2016
96ae317
Adding some missing license headers and a RAT config, which was missi…
snoopdave Jun 22, 2016
4fb807f
Merge branch 'akka-common' into usergrid-1268-akka-211
snoopdave Jun 22, 2016
e50f5c6
Correcting property name.
snoopdave Jun 22, 2016
7f49c80
Fixes for linked collections
Jun 22, 2016
75d2254
Implement smarter loading of unique value entries in hopes to avoid d…
Jun 22, 2016
5c81a02
Reset unique value test to its original state.
Jun 22, 2016
70f50c2
Better handle different combinations of possible duplicate entities a…
Jun 23, 2016
e24ea20
Fix some comments.
Jun 23, 2016
b6b0132
Fix log statement to use .trace()
Jun 23, 2016
c23f16a
initial commit for ApogeeSSO2-Usergrid integration. Added an interfac…
ayesha12 Jun 23, 2016
20ae382
Add additional logging around batch entity creation.
Jun 23, 2016
cf4c7f8
Fix log statement. Only newer duplicate unique value entries are rem…
Jun 23, 2016
841409f
Separate the generic Akka config props from the ones specifically for…
snoopdave Jun 23, 2016
d12307b
Use ClusterClient feature instead of roles to ensure that all write a…
snoopdave Jun 23, 2016
5749492
Merge commit 'refs/pull/540/head' of github.com:apache/usergrid into …
Jun 23, 2016
e982ba4
Fix NPE with batch creation of entities.
Jun 23, 2016
c60aaa7
adding a separate class for UsergridCentral (implements ExternalToken…
ayesha12 Jun 24, 2016
2fb3ab3
Hook ReservationCache in via ClusterClients
snoopdave Jun 24, 2016
b0fbf14
Merge branch 'release-2.1.1'
Jun 24, 2016
6756035
Merge remote-tracking branch 'upstream/master' into SSO2-Usergrid
ayesha12 Jun 24, 2016
ead9e89
Update README to better reflect tested ES versions.
Jun 24, 2016
b21e477
Merge commit 'refs/pull/542/head' of github.com:apache/usergrid into …
Jun 24, 2016
c4f72ef
Merge branch 'release-2.1.1' of https://git-wip-us.apache.org/repos/a…
snoopdave Jun 24, 2016
25303e6
Merge branch 'release-2.1.1' into usergrid-1268-akka-211
snoopdave Jun 24, 2016
7cf07b4
Reconfigure using factory pattern for external SSO providers. Implem…
Jun 24, 2016
6c36882
Removed files that were moved elsewhere.
Jun 24, 2016
87dad49
Merge branch 'apigee-sso-provider' of https://github.com/apache/userg…
ayesha12 Jun 25, 2016
71cbd8e
Add license header to new files.
Jun 25, 2016
f097e35
Merge branch 'apigee-sso-provider' of https://github.com/apache/userg…
ayesha12 Jun 27, 2016
0c965ae
Add application id to log for duplicate unique values.
Jun 27, 2016
14f5f7a
Allow Akka authoritative region to be null and if null, uses current …
snoopdave Jun 27, 2016
3764234
Allow UG to inject this class even if public key URL is not specified…
Jun 27, 2016
526748b
Merge branch 'apigee-sso-provider' of https://github.com/apache/userg…
ayesha12 Jun 27, 2016
09280b1
Added app id to the other duplicate unique value log.
Jun 28, 2016
9c4b524
Enhance some logic around deleting of edges.
Jun 28, 2016
724968a
Improve read repair for missing Edge (app->collection). Also enhance…
Jun 29, 2016
ca9383b
Add missing property
snoopdave Jun 29, 2016
37c482c
Merge branch 'release-2.1.1' of https://git-wip-us.apache.org/repos/a…
snoopdave Jun 29, 2016
639b421
Merge branch 'release-2.1.1' into usergrid-1268-akka-211
snoopdave Jun 29, 2016
5803916
Clean up em.removeFromCollection and fix UniqueValueScanner to just l…
Jun 29, 2016
426449e
Merge branch 'release-2.1.1' of https://git-wip-us.apache.org/repos/a…
Jun 29, 2016
f4ae0cb
Clean up em.removeFromCollection and fix UniqueValueScanner to just l…
Jun 29, 2016
a6c307b
Add edge read repair on entity updates.
Jun 29, 2016
8242878
Expose option to perform the uniqueIndexRepair higher up to the calle…
Jun 30, 2016
2d5ad05
Merge branch 'release-2.1.1' into usergrid-1268-akka-211
snoopdave Jun 30, 2016
b0c3059
Add additional logging during unique value read repair.
Jul 1, 2016
57231f0
Add additional logging during write unique verification.
Jul 1, 2016
61aa037
Make logging more readable.
Jul 1, 2016
f0c9fd4
Simplify and rename Actorsystem configuration properties to be more g…
snoopdave Jul 1, 2016
3bba425
Fix issue with checking pre-write unique value violations.
Jul 1, 2016
1b4e117
add missing license headers
snoopdave Jul 1, 2016
5ddb1cd
Fix port settings for tests
snoopdave Jul 1, 2016
557ea91
Fix ports in REST tests too.
snoopdave Jul 1, 2016
ada914a
Clean up unique value scanner and let it get consistently level from …
Jul 1, 2016
e0a5d98
Add more logging to unique value serialization.
Jul 3, 2016
02e1619
Set consistency level to ALL for now on unique value serialization st…
Jul 3, 2016
8982ddd
Improve consistency when returning entities/ids loaded from unique va…
Jul 3, 2016
670248d
Merge branch 'release-2.1.1' of https://git-wip-us.apache.org/repos/a…
snoopdave Jul 5, 2016
db6950b
Add delays to the App Delete tests as UV cleanup and take a couple of…
snoopdave Jul 5, 2016
8d79d36
Disable new token generation on get user details.
Jul 6, 2016
bd96b18
Make the unique value loading use the config interface for consistent…
Jul 6, 2016
4613e09
Add support for later versions of tomcat.
Jul 6, 2016
3e65e78
Fix tomcat dependency versions.
Jul 7, 2016
2cae866
Revert "Fix tomcat dependency versions."
Jul 7, 2016
86ae2cd
Revert "Add support for later versions of tomcat."
Jul 7, 2016
996bf09
Fixes to tests and test properties.
snoopdave Jul 7, 2016
917f0e3
Fixes to tests and test properties.
snoopdave Jul 7, 2016
e6c59ee
Fixing logic around entity delete to ensure that UniqueValues and Res…
snoopdave Jul 7, 2016
37972a2
Merge branch 'release-2.1.1' of https://git-wip-us.apache.org/repos/a…
snoopdave Jul 7, 2016
d5d89a8
Remove unnecessary releaseUniqueValues() logic.
snoopdave Jul 7, 2016
2fb55f0
Should be ignored
snoopdave Jul 7, 2016
47b7615
Oops
snoopdave Jul 7, 2016
31b2040
Increase test coverage of actorsystem module
snoopdave Jul 7, 2016
66ca27c
disabling activationWorkFlow if external SSO provider is enabled.
ayesha12 Jul 7, 2016
8413f21
Allow CORS pre-flight requests to come through unauthenticated ( bad …
Jul 8, 2016
2c59bd8
adding a check to ensure activationConfirmation emails are not sent f…
ayesha12 Jul 8, 2016
3ba4e59
Merge branch 'apigee-sso-provider' of https://github.com/apache/userg…
ayesha12 Jul 8, 2016
f95bf96
Fix issue where de-indexing assumed all entities were time based UUID…
Jul 8, 2016
b583207
Handling Exception - when admin user is not found in UG as it needs t…
ayesha12 Jul 8, 2016
930308d
made changes for PR comments..
ayesha12 Jul 8, 2016
897d373
adding comments.
ayesha12 Jul 8, 2016
6a790a8
removed unnecessary NPE check.. adding it in the methods call it.
ayesha12 Jul 8, 2016
5c54d15
changing the import to point to the correct one.
ayesha12 Jul 8, 2016
5f39ee0
Fix REST test issues and implement a way to shutdown the Akka actor s…
Jul 8, 2016
4f8183f
Merge commit 'refs/pull/543/head' of github.com:apache/usergrid into …
Jul 11, 2016
d393445
reading token from SecurityUtils rather than queryParams.
ayesha12 Jul 11, 2016
6e093bc
for users with SSO2 enabled, the admin users cannot reset the password.
ayesha12 Jul 12, 2016
8faad5b
Ensure the EntityIndexFactory is a singleton so the cache is actually…
Jul 12, 2016
a8f4218
Fix getAllEdgeDocuments in deleteEdge to return docs where entityId m…
Jul 13, 2016
849df67
Merge branch 'release-2.1.1'
Jul 14, 2016
d720f97
Align Java SDK version to the stack version. Removed unused imports …
Jul 14, 2016
9e038ef
Fix ActorSystem module dependency verion.
Jul 14, 2016
fad65a8
1. added /management/tokendetails?token=&provider=&keyurl
ayesha12 Jul 14, 2016
5a0756a
USERGRID-1306 - Usergrid .NET SDK Integration Tests assume http://api…
AndrewLane Jul 14, 2016
b11b397
Fix additional cache issues to ensure we correctly re-use a single ca…
Jul 14, 2016
3b6eb07
Clean up some naming around collection settings.
Jul 14, 2016
4e93bd6
Fix typo in default properties file.
Jul 14, 2016
91abfd8
Merge branch 'release-2.1.1'
Jul 14, 2016
b23c20a
Merge branch 'master' into datastax-cass-driver
Jul 17, 2016
7738ee0
Fixes Query Validator, but had to ignore 5 of the tests.
snoopdave Jul 19, 2016
9a45c49
Use constant score query when searching index for all edge docs and n…
Jul 20, 2016
30ba130
Convert delete ES queries to filters instead of queries.
Jul 20, 2016
5dc3324
Revert "Convert delete ES queries to filters instead of queries."
Jul 20, 2016
d7bb25a
Merge branch 'release-2.1.1' into usergrid-221-queryvalidator
snoopdave Jul 20, 2016
7c8ba0d
Add three additional query tests to EntityIndexTest and add reference…
snoopdave Jul 20, 2016
5fcad44
superuser to be able to create an org with new user or existing user.
ayesha12 Jul 21, 2016
06cc50f
require RouterProducers to provide list of the Message Types that the…
snoopdave Jul 25, 2016
00aeed8
Simplify RouterProducer interface, make it more generic (it is not ju…
snoopdave Jul 26, 2016
32782a3
Update comment
Jul 26, 2016
6d88bcf
Cleanup. Add tests.
ayesha12 Jul 26, 2016
6bdb56f
Merge commit 'refs/pull/550/head' of github.com:apache/usergrid into …
Jul 26, 2016
789f884
Fix java SDK dependency version in query-validator module.
Jul 26, 2016
32f9e55
Initial checkin for Python Utilities and SDK
jewest27 Jul 26, 2016
f8d5713
Code review changes
ayesha12 Jul 26, 2016
a22dc92
Merge commit 'refs/pull/551/head' of github.com:apache/usergrid into …
Jul 26, 2016
92554a4
Merge branch 'release-2.1.1'
Jul 26, 2016
d6941b7
Merge branch 'master' into apigee-sso-provider
Jul 26, 2016
acd8719
Fix issue with ApiServerRunner and Java SDK version mismatch.
Jul 26, 2016
9d78b59
Merge branch 'master' into apigee-sso-provider
Jul 26, 2016
180bccf
changed to apache
jewest27 Jul 26, 2016
a57f865
added apache header, cleaned up some things.
jewest27 Jul 26, 2016
0952603
cleaned up with decent sample data
jewest27 Jul 26, 2016
3bc3d78
additional cleanup
jewest27 Jul 26, 2016
04a896e
fixed indentation on disconnect_entities
jewest27 Jul 27, 2016
494f1bb
Add some delay in query validator test after creating data for the as…
Jul 27, 2016
4558dc9
Merge branch 'release-2.1.1'
Jul 27, 2016
ddde8dd
Merge branch 'master' into apigee-sso-provider
Jul 27, 2016
5abd2a1
Updates to Java SDK to allow management user authentication.
Jul 27, 2016
055289a
Queryvalidator to use new constructor for admin user authentication w…
Jul 27, 2016
50eee86
Merge branch 'master' into apigee-sso-provider
Jul 27, 2016
1e11464
Let the java SDK handle null ql values passed in and update UG stack …
Jul 28, 2016
98f95f9
Merge branch 'master' into apigee-sso-provider
Jul 28, 2016
c212f1f
updated Apache license header
jewest27 Jul 28, 2016
3b9e3c4
updated Apache license header
jewest27 Jul 28, 2016
c47e6f6
updated author
jewest27 Jul 28, 2016
ac9cfff
updated author
jewest27 Jul 28, 2016
be18bc1
added sample URLs for retrieving data
jewest27 Jul 28, 2016
2ba664c
Merge commit 'refs/pull/545/head' of github.com:apache/usergrid
Aug 1, 2016
a35cd38
Merge commit 'refs/pull/552/head' of github.com:apache/usergrid
Aug 1, 2016
f299c90
Merge commit 'refs/pull/547/head' of github.com:apache/usergrid
Aug 1, 2016
1d65496
Merge commit 'refs/pull/494/head' of github.com:apache/usergrid
Aug 1, 2016
eeb02d8
This closes #485 -- invalid PR
Aug 1, 2016
79f0ce4
This closes #449 -- Outdated PR
Aug 1, 2016
42cb2d0
This closes #533 -- Unable to merge APM PR
Aug 1, 2016
e8f68a0
Merge commit 'refs/pull/509/head' of github.com:apache/usergrid
Aug 1, 2016
10e8957
Rename a static property variable and make a coulple methods protecte…
Aug 1, 2016
dd13f0b
Resolve merge conflicts for George's pull request https://github.com/…
ayesha12 Aug 1, 2016
f385b07
Add external sso user id to GET /management/me response
Aug 1, 2016
0b84023
Update error messages thrown when external SSO is enabled.
Aug 2, 2016
69625af
Expose external SSO userid and reduce the management/me response.
Aug 2, 2016
81de964
Better handle expired JWTs for Apigee SSO token validation. Fix typos.
Aug 2, 2016
8d4e597
Add runtime exception mapper to 500 status code.
Aug 2, 2016
bc11bc4
Merge commit 'refs/pull/554/head' of github.com:apache/usergrid
Aug 5, 2016
928f447
This closes #520 -- Unable to merge
Aug 5, 2016
c0dd93e
This closes #519 -- Unable to merge
Aug 5, 2016
2a514d4
Use the interface for creating admin users.
Aug 8, 2016
b1157a8
Fixing https://issues.apache.org/jira/browse/USERGRID-1310.
ayesha12 Aug 11, 2016
1a83bfc
Merge branch 'master' of github.com:apache/usergrid into Usergrid1310
ayesha12 Aug 11, 2016
4531adf
if(entityType.isPresent()) --> never gets into this path for getting …
ayesha12 Aug 12, 2016
7383469
if(entityType.isPresent()) --> never gets into this path for getting …
ayesha12 Aug 12, 2016
588a0b5
NPE bug fix and uncommenting the test
ayesha12 Aug 12, 2016
fdfc971
Merge branch 'Usergrid1310' of github.com:ayesha12/usergrid into User…
ayesha12 Aug 12, 2016
32204b9
Add hooks for post processing for external integrations. Update secu…
Aug 12, 2016
77b6573
Merge commit 'refs/pull/557/head' of github.com:apache/usergrid
Aug 12, 2016
f919603
Make unique value actor system logic more configurable.
Aug 15, 2016
5095891
Merge branch 'master' into datastax-cass-driver
Aug 17, 2016
ba2d985
Update # of cassandra connections for collection module unit tests.
Aug 17, 2016
261af48
Reduce load on Datastax driver's control connection ( mainly b/c of o…
Aug 18, 2016
ec2e862
Move to latest datastax driver version.
Aug 18, 2016
b1d3e25
Change to latest 2.1 version of datastax driver.
Aug 18, 2016
ceb50ff
Fix bootstrapping issue and limit the amount of cache used for Graph …
Aug 19, 2016
fe197af
Enhance Map_Keys and give the ability to properly page the keys of a …
Aug 19, 2016
320cf00
Make schema creation more robust so parallel test execution doesn't o…
Aug 19, 2016
cdab708
Add additional socket options to datastax driver configuration.
Aug 19, 2016
92d5f40
Reduce # of database connections in the tests now so cassandra doesn'…
Aug 19, 2016
fcbe803
Fix issue with map manager key sorting. Enhance buffer sizing by usi…
Aug 19, 2016
1238ce0
Tune some test properties.
Aug 19, 2016
e8b9ad5
Update MapManager test execution.
Aug 19, 2016
7625b0d
Load properties into Guice by using the getProperty method instead of…
Aug 19, 2016
6a54d0d
Reduce the cache size for graph shards.
Aug 19, 2016
80e9f37
Merge branch 'release-2.1.1'
Aug 19, 2016
b5ed32a
Enhance the SQS polling timeout and clean up some log statements.
Aug 19, 2016
d2061dc
Merge branch 'hotfix-20160819'
Aug 19, 2016
3cfd2e3
changing the query builder to add wildcard search to Post_Filter.
ayesha12 Aug 25, 2016
c239a2b
added tests back which were ignored (waiting fix for Usergrid-1314)
ayesha12 Aug 30, 2016
1de577a
changed to add the search with 'contains' in the post_filter
ayesha12 Aug 30, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
updated Apache license header
  • Loading branch information
jewest27 committed Jul 28, 2016
commit c212f1f35576a9948c7aa30ea575419e6cb2f40e
18 changes: 18 additions & 0 deletions utils/usergrid-util-python/usergrid_tools/general/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# */
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# */
18 changes: 18 additions & 0 deletions utils/usergrid-util-python/usergrid_tools/indexing/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# */
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# */
18 changes: 18 additions & 0 deletions utils/usergrid-util-python/usergrid_tools/iterators/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# */
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# */
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ def run(self):
if empty_count >= 2:
keep_going = False

except Exception, e:
except Exception as e:
logger.exception('Error in CollectionWorker processing collection [%s]' % collection_name)
print traceback.format_exc()

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# */
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# */