Skip to content

Commit b0424dd

Browse files
zbalzbal
committed
Fix merge conflict
2 parents 3155156 + 97a3101 commit b0424dd

156 files changed

Lines changed: 2210 additions & 1062 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.npmignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
test/*

‎.travis.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
language: node_js
22
node_js:
33
- 0.8
4-
- 0.6
54

65
notifications:
76
email:

‎CONTRIBUTING.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ The only issues we accept are bug reports or feature requests. Bugs must be isol
2020

2121
## Pull requests
2222

23-
- Please follow the style guide being used in the pkgcloud code base.
23+
- Please follow the style guide being used in the pkgcloud code base (See: https://gist.github.com/indexzero/5368926)
2424
- If you are adding new methods please include documentation above the function definition.
2525
- If you are adding a new provider or new service please add the complete documentation to the `docs/` directory.
2626
- Please tag your commit depending what it does (`[misc]`, `[docs]`, `[database]`, `[compute]`)
@@ -41,7 +41,8 @@ The only issues we accept are bug reports or feature requests. Bugs must be isol
4141
- Never declare a function within a block.
4242
- Braces `{ }` must be used in all circumstances.
4343
- When it comes to Strings remember: Always use single quotes and Never use multi-line string literals.
44-
- Try to be "Elegant"
44+
- Try to be "Elegant"
45+
- Everything here: https://gist.github.com/indexzero/5368926
4546

4647
## Adding tests to my pull requests
4748

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# pkgcloud
1+
# pkgcloud [![Build Status](https://secure.travis-ci.org/nodejitsu/pkgcloud.png?branch=master)](http://travis-ci.org/nodejitsu/pkgcloud)
22

33
pkgcloud is a standard library for node.js that abstracts away differences among multiple cloud providers.
44

@@ -338,4 +338,4 @@ We are pretty flexible about these guidelines, but the closer you follow them th
338338

339339
#### Author: [Nodejitsu Inc.](http://nodejitsu.com)
340340
#### Contributors: [Charlie Robbins](https://github.com/indexzero), [Nuno Job](https://github.com/dscape), [Daniel Aristizabal](https://github.com/cronopio), [Marak Squires](https://github.com/marak), [Dale Stammen](https://github.com/stammen)
341-
#### License: MIT
341+
#### License: MIT

‎docs/providers/azure.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@ options = {
6464

6565
console.log("creating server...");
6666

67-
client.createServer(options, function(err, server) {
68-
if(err) {
67+
client.createServer(options, function (err, server) {
68+
if (err) {
6969
console.log(err);
7070
} else {
7171
// Wait for the server to reach the RUNNING state.
7272
// This may take several minutes.
7373
console.log("waiting for server RUNNING state...");
7474
server.setWait({ status: 'RUNNING' }, 10000, function (err, server) {
75-
if(err) {
75+
if (err) {
7676
console.log(err);
7777
} else {
7878
console.dir(server);
@@ -251,7 +251,7 @@ Azure Tables is available in `pkgcloud` as a `pkgcloud.databases` target. Here i
251251
//
252252
// Now delete that same Azure Table
253253
//
254-
client.remove(result.id, function(err, result) {
254+
client.remove(result.id, function (err, result) {
255255
//
256256
// Check the result
257257
//

‎docs/providers/mongohq.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ MongoHQ is available in `pkgcloud` as a `pkgcloud.databases` target. Here is an
2424
//
2525
// Now delete that same MongoDB
2626
//
27-
client.remove(result.id, function(err, result) {
27+
client.remove(result.id, function (err, result) {
2828
//
2929
// Check the result
3030
//

‎docs/providers/redistogo.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
//
2222
// Get the same redis we just created
2323
//
24-
client.get(result.id, function(err, result) {
24+
client.get(result.id, function (err, result) {
2525
//
2626
// Show the details of the database we just created
2727
//
2828
console.log(err, result);
29-
client.remove(result.id, function(err, result) {
29+
client.remove(result.id, function (err, result) {
3030
//
3131
// Ensure it was removed correctly.
3232
//

‎examples/compute/azure.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ options = {
4949

5050
console.log("creating server...");
5151

52-
client.createServer(options, function(err, server) {
53-
if(err) {
52+
client.createServer(options, function (err, server) {
53+
if (err) {
5454
console.log(err);
5555
} else {
5656
// Wait for the server to reach the RUNNING state.
5757
// This may take several minutes.
5858
console.log("waiting for server RUNNING state...");
5959
server.setWait({ status: 'RUNNING' }, 10000, function (err, server) {
60-
if(err) {
60+
if (err) {
6161
console.log(err);
6262
} else {
6363
console.dir(server);

‎examples/database/mongohq.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ client.create({
2121
//
2222
// Now delete that same MongoDB
2323
//
24-
client.remove(result.id, function(err, result) {
24+
client.remove(result.id, function (err, result) {
2525
//
2626
// Check the result
2727
//

‎examples/database/redistogo.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ client.create({
2020
//
2121
// Get the same redis we just created
2222
//
23-
client.get(result.id, function(err, result) {
23+
client.get(result.id, function (err, result) {
2424
//
2525
// Show the details of the database we just created
2626
//
2727
console.log(err, result);
28-
client.remove(result.id, function(err, result) {
28+
client.remove(result.id, function (err, result) {
2929
//
3030
// Ensure it was removed correctly.
3131
//

0 commit comments

Comments
 (0)