Skip to content
This repository has been archived by the owner on Jun 7, 2024. It is now read-only.

DO NOT MERGE YET - Usergrid 1260 #483

Open
wants to merge 1,786 commits into
base: master
Choose a base branch
from
Open

DO NOT MERGE YET - Usergrid 1260 #483

wants to merge 1,786 commits into from

Conversation

mdunker
Copy link
Contributor

@mdunker mdunker commented Feb 12, 2016

No description provided.

Shawn Feldman and others added 30 commits November 12, 2015 12:10
fix alias issues
3005331
fix alias issues
c068ab0
fix alias issues
f13e45b
@michaelarusso
Call foreach on the set directly and only call createEntityIndex on a…
b895643 
… unique set of appIds.
Merge branch '2.1-release' of https://git-wip-us.apache.org/repos/asf…
a693643 
…/usergrid into 2.1-release
@michaelarusso
Merge commit 'refs/pull/433/head' of github.com:apache/usergrid into …
63f49ba 
…2.1-release
Merge branch '2.1-release' of https://git-wip-us.apache.org/repos/asf…
6f61b05 
…/usergrid into 2.1-release
Merge branch 'refs/heads/2.1-release'
14dd48d
Addresses incorrect usages of .subscribe() and removed obsolete TODOs
d4d3ed3
Merge branch 'refs/heads/2.1-release'
c3c2818
@snoopdave
remove unnecessary binary file.
6827f08
@snoopdave
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/user…
bab89fe 
…grid
@snoopdave
Add a note about precedence to the operators page.
27de65c
@snoopdave
Add references to JIRA issues in @ignore annotations
f1aa450
@snoopdave
Remove some unnecessary ignore annotations and some unnecessary code.
1434dea
@snoopdave
Fix no-org-delete and test.
59d2a71
Removed unused file and unused variable
91a4911
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/user…
044b149 
…grid
@snoopdave
Un-ignore some tests that now appear to be working (again).
5c85b75
@GERey
Removed cassandra calls to hector that surrounded every create call. …
4dd8ef1 
…Should result in less ops to cassandra but not a major cause of pain.
@michaelarusso
Cleanup some name changes on the response import tasks scheduler.
8ed1bc7
@michaelarusso
Merge branch '2.1-release' of https://git-wip-us.apache.org/repos/asf…
fdcae67 
…/usergrid
@snoopdave
Unignoring and fixing tests more tests.
40cd379
@michaelarusso
Add back in shard meta removal.
afffdf2
@snoopdave
Correct Jacoco profile command arg
bba77f0
@snoopdave
Tests run more reliably with 20 iterations.
f2cbf1a
@snoopdave
Merge branch 'master' into ignores
1385366
Added test to prove shard ordering.
2b2793f
Added additional test for isNew in shardEntryGroup
3a6fd94
@snoopdave
Fix spelling error in class names.
f62e0aa
snoopdave and others added 27 commits January 30, 2016 21:55
@snoopdave
More deployment guide updates.
df4b685
@michaelarusso
USERGRID-683 - use only the AWS sdks required and re-format the pom f…
1fcbcf4 
…iles in the process.
@michaelarusso
Explicitly call out the AWS dependency in tests POM rather than assum…
019d49e 
…ing the dependency from usergrid-services.
@michaelarusso
Merge commit 'refs/pull/475/head' of github.com:apache/usergrid
10733b2
@michaelarusso
Merge commit 'refs/pull/477/head' of github.com:apache/usergrid
548334b
@GERey
Added message id for tracking, doesn't affect anything except that on…
4aac68e 
…e log
USERGRID-1243: logging overhaul, pt. 2
54e62f9
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/user…
47a8670 
…grid into USERGRID-1243
@michaelarusso
Fix issue with timestamps being set with longs that do not correspond…
f7b5516 
… to time. Remove unused dependencies. Remove CountMinSketch depedency and leverage RX distinct to filter duplicated devices from being emitted.
@michaelarusso
Remove additional unused python references.
8bead20
@michaelarusso
Add additional node.js integration tests for groups/users/devices.
b669892
@snoopdave
Add DRAFT Usergrid 2.1.0 deployment guide and upgrade website to use …
3fbb7d4 
…Nanoc 4.
@snoopdave
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/user…
4218c19 
…grid
@snoopdave
Fixes to new 2.1.0 (unreleased) deployment guide, and add it to the t…
a77ec46 
…able of contents (that's why so many files changed)
@snoopdave
Bring in docs and website from master.
5ed3d75
@snoopdave
Remove crash.log
d4c0c83
@snoopdave
Merge branch 'pr/473'
1dedb0f 
Conflicts:
	README.md
	docs/installation/deployment-guide.md
	website/lib/default.rb
	website/nanoc.yaml
	website/run.sh
@snoopdave
Correct Cassandra default port is 9160.
9b8d1dc
@michaelarusso
Add caching to queue manager so we don't create many instances of loc…
853d648 
…al or SNS queue manager impls for the same exact queue. Enhance the node.js integration tests.
@michaelarusso
Remove unnecessary log statement introduced.
857c717
@michaelarusso
Remove deliver from portal send notification as it was defaulting thi…
a958b05 
…s to 'null' anyways.
@snoopdave
Updating an improving getting started docs for 2.1 release.
db939e7
@snoopdave
Updating docs and website for upcoming 2.1 release.
33a3e21
@snoopdave
Fix in the TOC
ab6df53
@snoopdave
Minor README corrections.
dad3aba
USERGRID-1260: Asset and Accept Header changes
cee1392
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/user…
274c28e 
…grid into USERGRID-1260
@mdunker mdunker changed the title Usergrid 1260 DO NOT MERGE YET - Usergrid 1260 Feb 12, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
7 participants
@mdunker @jewest27 @michaelarusso @snoopdave @GERey @lewismc @kwiky