You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2016/11/17 20:36:37 UTC
[02/50] usergrid-nodejs git commit: Merge remote-tracking branch
'origin/master'
Merge remote-tracking branch 'origin/master'
# Conflicts:
# README.md
Project: http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/commit/b15fbcb3
Tree: http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/tree/b15fbcb3
Diff: http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/diff/b15fbcb3
Branch: refs/heads/master
Commit: b15fbcb3ea98bac5fd0ca2cddef236f74c42e89f
Parents: c2e4f0a 3813e99
Author: brandon <br...@behemoth.ca>
Authored: Fri Feb 5 17:57:46 2016 -0800
Committer: brandon <br...@behemoth.ca>
Committed: Fri Feb 5 17:57:46 2016 -0800
----------------------------------------------------------------------
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/blob/b15fbcb3/README.md
----------------------------------------------------------------------
diff --cc README.md
index 2ab5926,598f612..e88fab0
--- a/README.md
+++ b/README.md
@@@ -6,7 -6,7 +6,7 @@@ Node.js SDK 2.0 for Usergri
Currently a work in progress; documentation and implementation are subject to change.
- > **Note:** Node.js SDK 2.0 for Usergrid is **not** backwards compatible with 0.1X versions of the SDK. If your application is dependent on the 0.1X set of Node.js APIs, you will need to continue using the 0.1X version (see below for installation instructions).
-> **Note:** Usergrid 2.0 SDK is **not** backwards compatible with 0.1X.XX versions of the SDK as 2.0. If you are currently using 0.1X in a production application, see below for using the 0.1X version with your application.
++_**Note:** This Node.js SDK 2.0 for Usergrid is **not** backwards compatible with 0.1X versions of the SDK. If your application is dependent on the 0.1X set of Node.js APIs, you will need to continue using the 0.1X version (see below for installation instructions)._
### Current release