Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
e61ee49
Working on v2.0.0
chrisdickinson Apr 17, 2015
6870764
doc: update CONTRIBUTING.md
brendanashworth Apr 18, 2015
7180597
Revert "http: don't bother making a copy of the options"
brendanashworth Apr 18, 2015
6bf85bc
test: add test for 06cfff9 regression
brendanashworth Apr 18, 2015
59a5c98
Merge v1.8.1.
chrisdickinson Apr 21, 2015
2632775
doc: update AUTHORS list
rvagg Apr 20, 2015
b16a328
doc: add spaces to child.kill example
enaqx Apr 22, 2015
22aafa5
doc: add Fishrock123 to the TC
Fishrock123 Apr 23, 2015
a7d7463
tls_wrap: use localhost if options.host is empty
sitegui Apr 21, 2015
7384ca8
module: remove '' from Module.globalPaths
chrisyip Apr 21, 2015
bb254b5
doc: update branch to master
silverwind Apr 23, 2015
3d3083b
buffer: little improve for Buffer.concat method
JacksonTian Apr 16, 2015
1bef717
net: cleanup connect logic
evanlucas Apr 22, 2015
4abe2fa
net: add lookup option to Socket.prototype.connect
evanlucas Apr 22, 2015
f3cc50f
doc: add TC meeting 2015-04-08 minutes
rvagg Apr 22, 2015
5178f93
doc: Add Addon API (NAN) to working group list
julianduque Apr 25, 2015
bf7ac08
util: add Map and Set inspection support
monsanto Apr 20, 2015
3bda6cb
win,node-gyp: enable delay-load hook by default
piscisaureus Apr 15, 2015
5472139
test: adjust Makefile/test-ci, add to vcbuild.bat
rvagg Apr 26, 2015
bfae823
test: fix test-net-dns-custom-lookup test assertion
evanlucas Apr 26, 2015
2a3c8c1
build: remove -J from test-ci
rvagg Apr 28, 2015
e55fdc4
doc: fix util.deprecate example
enaqx Apr 27, 2015
0fa6c4a
string_decoder: don't cache Buffer.isEncoding
mscdex Apr 28, 2015
391cae3
doc: Add Known issues to v1.7.0/1.7.1 CHANGELOG
yosuke-furukawa Apr 20, 2015
1bcdf46
doc: add TC meeting 2015-04-15 minutes
rvagg Apr 22, 2015
b57cc51
os: remove trailing slash from os.tmpdir()
tellnes Feb 6, 2015
36cd5fb
deps: upgrade v8 to 4.2.77.13
bnoordhuis Mar 27, 2015
db4ded5
deps: enable v8 postmortem debugging again
bnoordhuis Mar 27, 2015
01e6632
deps: upgrade v8 to 4.2.77.15
bnoordhuis Apr 11, 2015
01652c7
deps: upgrade v8 to 4.2.77.18
chrisdickinson Apr 25, 2015
509b59e
deps: enable v8 postmortem debugging again
bnoordhuis Mar 27, 2015
f9c681c
fs: validate fd on fs.write
julianduque Apr 28, 2015
f9b226c
test: extend timeouts for ARMv6
rvagg Apr 29, 2015
bf07d13
url: significantly improve the performance of the url module
petkaantonov Mar 23, 2015
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
doc: update CONTRIBUTING.md
This commit:
  - fixes development branch (v1.x -> master)
  - updates stability index wording
  - use iojs binary instead of node

PR-URL: #1466
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
  • Loading branch information
brendanashworth committed Apr 18, 2015
commit 68707648fddf104cc7d34309d9a8e29a4e1af152
22 changes: 7 additions & 15 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,8 @@ $ git remote add upstream git://github.com/iojs/io.js.git

#### Which branch?

Now decide if you want your feature or bug fix to go into the master branch
or the stable branch. As a rule of thumb, bug fixes go into the stable branch
while new features go into the master branch.

The stable branch is effectively frozen; patches that change the io.js
API/ABI or affect the run-time behavior of applications get rejected. The
current stable branch is set as the default branch on GitHub.
For developing new features and bug fixes, the `master` branch should be pulled
and built upon.

#### Respect the stability index

Expand All @@ -49,7 +44,7 @@ The rules for the master branch are less strict; consult the

In a nutshell, modules are at varying levels of API stability. Bug fixes are
always welcome but API or behavioral changes to modules at stability level 3
and up are off-limits.
(Locked) are off-limits.

#### Dependencies

Expand All @@ -71,12 +66,9 @@ does not align with the project team.
Create a feature branch and start hacking:

```text
$ git checkout -b my-feature-branch -t origin/v1.x
$ git checkout -b my-feature-branch -t origin/master
```

(Where `v1.x` is the latest stable branch as of this writing.)


### Step 3: Commit

Make sure git knows your name and email address:
Expand Down Expand Up @@ -123,7 +115,7 @@ Use `git rebase` (not `git merge`) to sync your work from time to time.

```text
$ git fetch upstream
$ git rebase upstream/v1.x # or upstream/master
$ git rebase upstream/master
```


Expand All @@ -147,10 +139,10 @@ can use this syntax to run it exactly as the test harness would:
$ python tools/test.py -v --mode=release parallel/test-stream2-transform
```

You can run tests directly with node:
You can run tests directly with iojs:

```text
$ node ./test/parallel/test-streams2-transform.js
$ iojs ./test/parallel/test-streams2-transform.js
```


Expand Down