00:00:42  * mmalecki[bar]joined
00:02:04  * kazuponquit (Ping timeout: 256 seconds)
00:09:52  * dapquit (Quit: Leaving.)
00:10:49  * dapjoined
00:10:52  * dapquit (Client Quit)
00:12:21  * dapjoined
00:13:01  * dapquit (Client Quit)
00:14:15  * Ariaquit (Remote host closed the connection)
00:14:25  * Ariajoined
00:42:53  * EhevuTovquit (Quit: Leaving)
00:43:44  * jmar777quit (Remote host closed the connection)
00:44:18  * jmar777joined
00:46:31  * lohkeyjoined
00:48:31  * jmar777_joined
00:48:42  * jmar777quit (Ping timeout: 260 seconds)
00:50:37  * lohkeyquit (Ping timeout: 240 seconds)
00:53:48  <bnoordhuis>isaacs: https://github.com/joyent/node/pull/4129
00:57:57  * kazuponjoined
01:01:47  <isaacs>bnoordhuis: lgtm
01:01:52  <bnoordhuis>thanks
01:02:02  <isaacs>bnoordhuis: so, quick question, i think i knwo the answer, but just wnana sanity check.
01:02:25  <bnoordhuis>isaacs: shoot
01:02:30  <isaacs>Buffer::New(charpointer, len); delete [] charpointer;
01:02:32  <isaacs>safe?
01:02:35  <MI6>joyent/node: Ben Noordhuis master * 2fbf061 : crypto: sort return value of getCiphers/getHashes (+1 more commits) - http://git.io/8SZoxw
01:02:37  <isaacs>or kaboom?
01:02:40  <bnoordhuis>isaacs: safe
01:02:43  * kazuponquit (Ping timeout: 248 seconds)
01:02:43  <isaacs>k
01:02:54  <isaacs>is it a leak if the delete is *not* there?
01:03:05  <bnoordhuis>if charpointer[] was new'ed, yes :)
01:03:09  <isaacs>ok
01:03:20  <isaacs>thanks
01:06:59  * ericktjoined
01:18:09  * brsonquit (Ping timeout: 246 seconds)
01:25:00  * isufyquit
01:30:01  * isufyjoined
01:34:16  <MI6>joyent/node: isaacs crypto-buffers * cb1a9f9 : crypto: remove non-buffer c++ code (+1 more commits) - http://git.io/5ihBSw
01:34:25  <isaacs>lotta red
01:36:25  * mmalecki[bar]quit (Ping timeout: 260 seconds)
01:39:40  * ericktquit (Quit: erickt)
01:58:05  * ericktjoined
01:58:44  * kazuponjoined
02:03:22  * TooTallNatequit (Quit: Computer has gone to sleep.)
02:03:26  * kazuponquit (Ping timeout: 260 seconds)
02:03:47  * ericktquit (Quit: erickt)
02:05:13  * brsonjoined
02:07:00  <MI6>joyent/node: isaacs crypto-buffers * 7fc50b2 : tls: Provide buffer to Connection.setSession - http://git.io/D-FYBw
02:09:23  <MI6>joyent/node: isaacs crypto-buffers * 9863b56 : doc: crypto 'Defaults to buffer' - http://git.io/7GfpQA
02:21:01  <deoxxa>hooray for negative line counts
02:25:42  <piscisaureus_>where's ryah when you need him
02:42:11  * ericktjoined
02:43:35  * AvianFluquit (Remote host closed the connection)
02:44:00  <piscisaureus_>bnoordhuis is making it late today
02:44:02  <piscisaureus_>I'm not
02:44:07  <piscisaureus_>farewell all
02:44:11  * piscisaureus_quit (Quit: ~ Trillian Astra - www.trillian.im ~)
02:44:19  * bnoordhuisquit (Ping timeout: 252 seconds)
02:59:43  * kazuponjoined
03:00:04  * philips_quit (Excess Flood)
03:00:57  * philips_joined
03:04:32  * kazuponquit (Ping timeout: 256 seconds)
03:27:25  * mmalecki[bar]joined
03:27:34  * mmalecki[bar]changed nick to mmalecki
03:34:46  * ericktquit (Quit: erickt)
03:36:58  * jmar777_quit (Remote host closed the connection)
03:47:40  * stagasquit (Ping timeout: 246 seconds)
03:50:03  * brsonquit (Ping timeout: 246 seconds)
04:00:23  * kazuponjoined
04:05:44  * kazuponquit (Ping timeout: 276 seconds)
04:08:02  * pquernaquit (Ping timeout: 260 seconds)
04:08:12  * rphillipsquit (Ping timeout: 260 seconds)
04:11:36  * felixgejoined
04:11:38  * felixgequit (Changing host)
04:11:38  * felixgejoined
04:13:58  * rphillipsjoined
04:16:14  * pquernajoined
04:16:29  * felixgequit (Client Quit)
04:18:01  * felixgejoined
04:18:01  * felixgequit (Changing host)
04:18:01  * felixgejoined
04:24:49  * AvianFlujoined
04:32:01  * brsonjoined
04:32:08  * brsonquit (Client Quit)
04:32:14  * brsonjoined
04:32:48  * AvianFluquit (Remote host closed the connection)
04:34:05  * felixgequit (Ping timeout: 245 seconds)
04:51:51  * Ariaquit (Remote host closed the connection)
05:01:20  * kazuponjoined
05:05:21  * felixgejoined
05:05:21  * felixgequit (Changing host)
05:05:21  * felixgejoined
05:05:43  * kazuponquit (Ping timeout: 246 seconds)
05:16:11  * jmar777joined
05:19:30  * felixgequit (Ping timeout: 245 seconds)
05:26:03  * tomshredsjoined
05:27:29  * paddybyersjoined
05:36:50  * jmar777quit (Remote host closed the connection)
05:37:26  * jmar777joined
05:41:34  * jmar777quit (Ping timeout: 246 seconds)
05:54:07  * TooTallNatejoined
05:54:10  * Ariajoined
05:56:04  * Ariaquit (Read error: Operation timed out)
06:01:49  * kazuponjoined
06:07:50  * kazuponquit (Ping timeout: 240 seconds)
06:10:07  * tomshredsquit (Quit: Leaving...)
06:14:16  * TooTallNatequit (Quit: ["Textual IRC Client: www.textualapp.com"])
06:14:37  * felixgejoined
06:14:37  * felixgequit (Changing host)
06:14:37  * felixgejoined
06:19:43  * felixgequit (Ping timeout: 272 seconds)
06:26:27  * felixgejoined
06:26:27  * felixgequit (Changing host)
06:26:27  * felixgejoined
06:30:45  * felixgequit (Ping timeout: 245 seconds)
06:35:07  * kazuponjoined
06:39:30  * kazuponquit (Ping timeout: 240 seconds)
06:43:40  * paddybyersquit (Ping timeout: 245 seconds)
06:54:12  * Ariajoined
06:56:11  * Ariaquit (Read error: Operation timed out)
07:02:54  * Raltjoined
07:22:27  * rendarjoined
07:26:00  * Raltquit (Remote host closed the connection)
07:26:36  * Raltjoined
07:29:32  * stagasjoined
07:31:02  * Raltquit (Ping timeout: 260 seconds)
07:32:32  * AvianFlujoined
07:35:34  * kazuponjoined
07:38:29  * AvianFluquit (Remote host closed the connection)
07:39:57  * kazuponquit (Ping timeout: 240 seconds)
07:45:12  * joshthecoderquit (Quit: Linkinus - http://linkinus.com)
07:45:31  * paddybyersjoined
07:48:41  <indutny>hi
07:49:55  * paddybyersquit (Ping timeout: 245 seconds)
07:54:14  * Ariajoined
07:56:25  * Ariaquit (Read error: Operation timed out)
08:08:43  * isufyquit
08:11:59  * brsonquit (Ping timeout: 245 seconds)
08:14:17  * felixgejoined
08:33:11  * Raltjoined
08:36:21  * kazuponjoined
08:40:51  * kazuponquit (Ping timeout: 248 seconds)
08:54:16  * Ariajoined
08:58:39  * Ariaquit (Ping timeout: 245 seconds)
09:01:21  * paddybyersjoined
09:05:45  * paddybyersquit (Ping timeout: 245 seconds)
09:14:17  * stagasquit (Read error: Connection reset by peer)
09:15:40  * paddybyersjoined
09:25:44  * paddybyersquit (Ping timeout: 245 seconds)
09:37:08  * kazuponjoined
09:41:39  * kazuponquit (Ping timeout: 248 seconds)
09:48:09  * felixgequit (Remote host closed the connection)
09:48:25  * felixgejoined
09:54:17  * Ariajoined
09:55:53  * Ariaquit (Read error: Operation timed out)
09:57:08  * AndreasMadsenjoined
10:17:16  * felixge_joined
10:17:16  * felixge_quit (Changing host)
10:17:16  * felixge_joined
10:17:17  * felixgequit (Read error: Connection reset by peer)
10:17:17  * felixge_changed nick to felixge
10:35:48  * davispquit (Quit: I quit!)
10:37:58  * kazuponjoined
10:39:01  * stagasjoined
10:41:16  * wankdankerquit (Ping timeout: 256 seconds)
10:42:17  * kazuponquit (Ping timeout: 240 seconds)
10:46:25  * Ariajoined
11:00:22  * paddybyersjoined
11:38:26  * kazuponjoined
11:43:20  * kazuponquit (Ping timeout: 276 seconds)
12:08:58  * Raltquit (Remote host closed the connection)
12:09:32  * Raltjoined
12:13:57  * Raltquit (Ping timeout: 240 seconds)
12:21:05  * wankdankerjoined
12:39:40  * kazuponjoined
12:44:34  * kazuponquit (Ping timeout: 255 seconds)
12:45:54  * mmaleckiquit (Ping timeout: 246 seconds)
12:53:05  * Raltjoined
12:57:14  * AvianFlujoined
12:58:22  * wankdankerquit (Ping timeout: 246 seconds)
13:05:46  * bnoordhuisjoined
13:08:10  * kuebkjoined
13:14:37  <bnoordhuis>ircretary: tell mmalecki it's libuv commit be2a217
13:14:38  <ircretary>bnoordhuis: I'll be sure to tell mmalecki
13:19:32  <MI6>joyent/node: Ben Noordhuis v0.8 * 4a23add : doc: rectify http.ClientResponse close/end events * The 'close' event do - http://git.io/Uuyt5A
13:26:34  <indutny>hooo
13:28:22  * kazuponjoined
13:37:32  * piscisaureus_joined
13:40:03  * stagasquit (Ping timeout: 248 seconds)
13:49:30  * hnakamurjoined
13:59:33  <indutny>piscisaureus_: ping
13:59:54  <piscisaureus_>hey fedor
14:00:42  * Ariaquit (Ping timeout: 245 seconds)
14:02:35  * wankdankerjoined
14:02:48  <piscisaureus_>indutny: ?
14:02:57  <indutny>piscisaureus_: sorry
14:03:03  <indutny>piscisaureus_: mind exporting some inlined assembly?
14:03:18  <indutny>like OPENSSL_atomic_add
14:03:32  <indutny>I suppose it's compiled on all platforms now, isn't it?
14:03:50  <piscisaureus_>indutny: what do you mean, exporting? How does one export inlined assembly?
14:03:58  <indutny>piscisaureus_: idk
14:04:05  <indutny>piscisaureus_: it's not visible from dynamic module
14:04:17  <indutny>I really don't know, but I need it :)
14:04:30  <indutny>may be I could try it
14:04:37  <indutny>myself
14:05:11  <piscisaureus_>indutny: I think it lives in the cpuid files
14:05:27  <piscisaureus_>indutny: so you could export the functions but they wouldn't be inlined
14:05:59  <piscisaureus_>indutny: but you should be aware that if you rely on that, your module won't work when people use system openssl
14:06:19  <piscisaureus_>indutny: I think it's a better idea to add atomic operations to libuv
14:06:33  <piscisaureus_>indutny: bnoordhuis and me were considering to add a separate header files that has a lot of these macros
14:07:46  <indutny>hm...
14:07:49  <indutny>yeah
14:07:52  <indutny>that would be good
14:09:04  * ericktjoined
14:12:11  * felixgequit (Remote host closed the connection)
14:12:23  * felixgejoined
14:13:54  <bnoordhuis>indutny: have you been able to reproduce that debugger test bug yet?
14:15:32  * felixge_joined
14:15:32  * felixgequit (Read error: Connection reset by peer)
14:15:32  * felixge_changed nick to felixge
14:25:15  * mmaleckijoined
14:26:55  * wankdankerquit (Ping timeout: 246 seconds)
14:27:35  * felixgequit (Quit: felixge)
14:29:31  <mmalecki>bnoordhuis: thanks
14:42:47  * kazuponquit (Remote host closed the connection)
14:46:15  <indutny>bnoordhuis: not yet
14:46:21  * ericktquit (Quit: erickt)
14:46:22  <indutny>bnoordhuis: actually, I have only tried it once
14:46:32  <indutny>bnoordhuis: and what's really interesting is that I haven't touched utf8 recently
14:46:41  <indutny>only default test-debugger-repl.js
14:50:37  * mmaleckiquit (Ping timeout: 256 seconds)
14:55:02  <piscisaureus_>hey saghul
14:55:14  <piscisaureus_>saghul: you should join the conversation: http://mail.python.org/pipermail/python-ideas/2012-October/016494.html
14:55:52  <indutny>piscisaureus_: about atomic operations
14:56:01  * hnakamurpart ("Leaving...")
14:56:03  <indutny>piscisaureus_: I changed my mind, they should return value
14:56:10  <indutny>like __sync_add_and_fetch does
14:56:27  <piscisaureus_>indutny: or, like __sync_fetch_and_add does ?
14:56:39  <indutny>I think the last one
14:56:50  <piscisaureus_>indutny: because I believe that's what the OS X imlementation does, and windows too
14:56:53  <indutny>aah
14:57:00  <indutny>that's no good
14:57:28  <indutny>nope
14:57:33  <indutny>on osx it returns result
14:57:51  <indutny>and exchange add should return result of operation too AFAIK
14:58:02  <piscisaureus_>although you can easily express one in terms of the other
14:58:16  <indutny>well, yes
14:58:41  <piscisaureus_>e.g. __sync_add_and_fetch(&x, y) == __sync_fetch_and_add(&x, y) + y
15:00:40  <indutny>yes
15:00:42  <indutny>I know
15:00:51  <indutny>but
15:01:05  <indutny>ATOMIC_ADD should return the same value on all platforms :)
15:01:10  <piscisaureus_>yes
15:01:12  <piscisaureus_>so pick one
15:01:12  <indutny>if one doesn't support add_and_fetch
15:01:15  <indutny>it should emulate one
15:01:23  <indutny>I like add and fetch
15:01:28  * AndreasMadsenquit (Remote host closed the connection)
15:01:31  <piscisaureus_>ok
15:01:32  <piscisaureus_>well
15:01:42  <piscisaureus_>in the windows implementation remove the (void)
15:02:09  <indutny>also
15:02:16  <piscisaureus_>and add make it (InterlockedExchangeAdd(addend, num) + num)
15:02:16  * Raltquit (Remote host closed the connection)
15:02:18  <indutny>we should accept pointer too
15:02:21  <indutny>ok
15:02:38  <indutny>are you sure it returns not result of operation?
15:02:45  <piscisaureus_>yes
15:02:53  * Raltjoined
15:03:05  <indutny>why
15:03:07  <indutny>xadd does it
15:03:10  <indutny>I mean instruction
15:03:15  <indutny>Exchanges the first operand (destination operand) with the second operand (source operand), then loads the sum of the two values into the destination operand.
15:03:16  <piscisaureus_>windows has the latter too (InterlockedAdd) but it is only supported on itanium
15:03:23  <indutny>oh
15:03:33  <piscisaureus_>indutny: I think it uses lock add and not lock xadd
15:03:35  <indutny>well, I don't understand why it's called ExchangeAdd then
15:03:43  <indutny>why exchange?!
15:04:23  <piscisaureus_>the "Exchange" in there means that it returns the initial value
15:04:37  <piscisaureus_>just like InterlockedExchange and InterlockedCompareExchange
15:04:46  <indutny>oh my gosh
15:04:52  <indutny>stupid MSVC stuff
15:04:56  <indutny>ok
15:05:05  <piscisaureus_>indutny: not sure tho. I will give you steve ballmers number, so you can ask yourself.
15:05:23  * Ariajoined
15:05:32  <indutny>piscisaureus_: cool
15:05:34  <indutny>sounds like a plan
15:05:59  * kuebkquit
15:07:16  <indutny>btw
15:07:19  <indutny>have you see lring repo?
15:07:29  * Raltquit (Ping timeout: 260 seconds)
15:07:48  <indutny>piscisaureus_: ^
15:07:58  <piscisaureus_>no
15:08:21  <indutny>http://github.com/indutny/lring
15:08:29  <indutny>you should add it to that gyp account
15:08:37  <indutny>it's plain C now
15:11:26  <indutny>piscisaureus_: and that's how I did it for windows: https://github.com/indutny/lring/blob/master/src/atomic.h#L57
15:11:27  <indutny>review?
15:11:50  <indutny>bnoordhuis: is this correct https://github.com/indutny/lring/blob/master/src/atomic.h#L14 ?
15:11:57  <indutny>(seems to be working, but anyway you're expert)
15:12:24  <bnoordhuis>indutny: yes, lgtm
15:12:29  <indutny>bnoordhuis: kewl
15:12:31  <indutny>bnoordhuis: thank you
15:12:36  <bnoordhuis>indutny: except for the fact that they both do xadd :)
15:12:58  <indutny>bnoordhuis: what do you propose?
15:13:03  <indutny>bnoordhuis: there're no xsub
15:16:48  <bnoordhuis>indutny: no, i kid - it looks okay to me
15:17:57  <bnoordhuis>is test/gc/test-net-timeout.js failing for everyone else as well?
15:18:05  <bnoordhuis>Collected: 499/500
15:18:41  <bnoordhuis>ps indutny
15:18:41  <bnoordhuis>$ ps aux | grep '[n]ode'
15:18:41  <bnoordhuis>1000 18679 0.0 0.0 764436 11196 pts/2 Sl 17:11 0:00 /home/bnoordhuis/src/nodejs/master/out/Release/node debug --port=13683 /home/bnoordhuis/src/nodejs/master/test/fixtures/breakpoints.js
15:18:45  <bnoordhuis>1000 18681 1.0 0.0 804828 9744 pts/2 Sl 17:11 0:03 /home/bnoordhuis/src/nodejs/master/out/Release/node --debug-brk=13683 /home/bnoordhuis/src/nodejs/master/test/fixtures/breakpoints.js
15:18:49  <bnoordhuis>1000 18833 1.0 0.0 664548 8944 pts/2 Sl 17:11 0:03 /home/bnoordhuis/src/nodejs/master/out/Release/node --debug-brk=13683 /home/bnoordhuis/src/nodejs/master/test/fixtures/breakpoints_utf8.js
15:18:56  <indutny>oh
15:18:58  <indutny>nice
15:19:30  <piscisaureus_>indutny: yes
15:20:29  * Raltjoined
15:23:19  <indutny>piscisaureus_: and btw, tlsnappy doesn't work with shared openssl
15:23:23  <indutny>:)
15:25:26  <bnoordhuis>https://github.com/joyent/node/pull/4134 <- review?
15:25:38  <bnoordhuis>indutny: how come?
15:25:56  * AndreasMadsenjoined
15:25:56  <indutny>bnoordhuis: it has no ifdefs for NPN and other modes
15:26:02  <bnoordhuis>oh
15:26:16  <indutny>I'm just too lame to fix it
15:26:22  * mmaleckijoined
15:26:22  <indutny>and I don't think it's really needed
15:32:02  <indutny>so what have we did with openssl
15:32:08  <indutny>between latest 0.8.12 and master
15:32:14  <indutny>it's slow as hell
15:38:19  * stagasjoined
15:41:40  <piscisaureus_>indutny: asm is off on master
15:41:47  <indutny>piscisaureus_: ah, that
15:41:50  <piscisaureus_>indutny: I take patches :-)
15:41:57  <indutny>piscisaureus_: why is it so?
15:41:58  <piscisaureus_>(muhaha)
15:42:05  <indutny>I surely can help
15:42:12  <piscisaureus_>indutny: I never got around fixing the 1.0.1 build to include all asm stuff
15:42:20  <piscisaureus_>and it was not really clear what we would need and what not
15:42:40  <piscisaureus_>you could start with applying the 0.8 asm patch to master
15:42:48  <piscisaureus_>and see how far it gets you
15:42:58  <indutny>ok
15:43:01  <indutny>piscisaureus_: what commit?
15:44:29  <piscisaureus_>indutny: it's a couple: https://github.com/joyent/node/commits/e0e9f0c15ac9fba896dd135ced1afa2601687dfe
15:44:32  * isufyjoined
15:45:26  <indutny>ok
15:47:57  * ericktjoined
15:48:45  * tomshredsjoined
15:53:14  * kazuponjoined
15:55:21  * AndreasMadsenquit (Remote host closed the connection)
15:58:15  * kazuponquit (Ping timeout: 245 seconds)
16:03:29  * stagasquit (Ping timeout: 260 seconds)
16:39:42  * wankdankerjoined
16:51:07  * stagasjoined
16:55:42  * dapjoined
17:06:27  * Raltquit (Remote host closed the connection)
17:18:08  * dapquit (Quit: Leaving.)
17:22:43  * dapjoined
17:49:53  * davispjoined
17:58:03  <mmalecki>bnoordhuis: ping?
17:58:19  * stagasquit (Read error: Connection reset by peer)
18:13:28  * c4milojoined
18:13:49  <mmalecki>ircretary: ask bnoordhuis if he would have problems with exposing handle type in process._getActiveHandles()
18:13:50  <ircretary>mmalecki: I'm not sure what to do with that command. Ask for help in PM.
18:14:06  <mmalecki>ircretary: tell bnoordhuis if he would have problems with exposing handle type in process._getActiveHandles()?
18:14:06  <ircretary>mmalecki: I'll be sure to tell bnoordhuis
18:15:58  * c4miloquit (Remote host closed the connection)
18:16:30  * c4milojoined
18:20:43  * c4miloquit (Ping timeout: 246 seconds)
18:25:34  * joshthecoderjoined
18:56:54  * Raltjoined
19:05:24  * piscisaureus_quit (Quit: ~ Trillian Astra - www.trillian.im ~)
19:07:37  <ryah>bnoordhuis: once you replace libev will we finally be free of all these god damn compile warnings?
19:09:14  * brsonjoined
19:13:11  * Ariaquit (Remote host closed the connection)
20:00:24  * piscisaureus_joined
20:03:10  * hzjoined
20:14:43  * Raltquit (Remote host closed the connection)
20:16:26  * toothrquit (Quit: here we are)
20:19:08  * Ariajoined
20:20:22  * piscisaureus_quit (Read error: No route to host)
20:20:49  * piscisaureus_joined
20:23:42  * toothrjoined
20:33:36  * tomshredsquit (Quit: Leaving...)
20:35:06  * joshthecoderquit (Quit: Linkinus - http://linkinus.com)
20:37:13  * ericktquit (Quit: erickt)
20:48:52  * mikealjoined
20:57:59  * hzquit
21:07:29  * tomshredsjoined
21:20:42  * ericktjoined
21:47:42  * joshthecoderjoined
21:52:42  * rendarquit
22:04:10  * piscisaureus_quit (Quit: ~ Trillian Astra - www.trillian.im ~)
22:06:01  * stephankquit (Ping timeout: 256 seconds)
22:08:34  * stephankjoined
22:21:17  * dapquit (Quit: Leaving.)
22:41:07  * brsonquit (Ping timeout: 252 seconds)
22:44:19  <bnoordhuis>ryah: yes
22:44:32  <bnoordhuis>mmalecki: why?
22:47:15  * brsonjoined
22:48:11  * TooTallNatejoined
22:48:11  <ryah>bnoordhuis: ah, it will be such a relief
22:48:27  <ryah>been staring at these god damn libev compiler warnings for like 4 years now
22:53:22  * felixgejoined
22:56:01  * brsonquit (Quit: leaving)
22:56:21  * hzjoined
22:58:09  <MI6>joyent/node: Dean McNamee master * 0c2ae83 : types arrays: remove unnecessary special-casing Uint32Value() on undefin (+1 more commits) - http://git.io/GlVPyA
22:58:25  <MI6>joyent/node: Dean McNamee master * 47643d2 : typed arrays: remove unnecessary special-casing Uint32Value() on undefin - http://git.io/pyzZEg
23:01:46  <TooTallNate>bnoordhuis: hey, you think we should merge v0.8 into master?
23:02:14  <bnoordhuis>TooTallNate: reversing the question, is there a reason *not* to merge v0.8 into master? :)
23:02:37  <TooTallNate>not that i know of
23:03:05  <bnoordhuis>i think we always do an up-merge after every release
23:03:26  <TooTallNate>but there's a doc patch in v0.8 that i need to update in master, so i need it
23:03:38  <TooTallNate>i think i did it properly, should i push to a review branch?
23:04:02  <TooTallNate>there was only 1 conflict I wasn't sure about
23:04:11  <TooTallNate>in node_crypto.cc
23:04:19  <bnoordhuis>sure, i'll review it
23:04:29  <bnoordhuis>i can guess what the crypto conflict was
23:04:37  * bnoordhuisis responsible for it
23:05:23  <TooTallNate>bnoordhuis: https://github.com/TooTallNate/node/compare/joyent:master...TooTallNate:merge
23:05:59  <TooTallNate>that was from last night's v0.8 branch though, there's been a couple patches
23:09:26  <bnoordhuis>TooTallNate: do you remember what the conflict looked like?
23:09:41  <TooTallNate>bnoordhuis: the crypto one?
23:09:43  <bnoordhuis>yes
23:10:25  <TooTallNate>pretty much
23:11:09  <TooTallNate>bnoordhuis: https://gist.github.com/d3363eac52a8a79a8322
23:11:30  <bnoordhuis>oh hah, silly merge algo
23:11:32  <bnoordhuis>lgtm
23:12:21  <TooTallNate>bnoordhuis: cool, thanks
23:15:09  <TooTallNate>bnoordhuis: what do you make of this one? https://gist.github.com/d9c4f9ae4b5fba614bd0
23:16:52  <bnoordhuis>TooTallNate: it doesn't matter, both work - it's the space that trips up git
23:17:21  <bnoordhuis>but take the one that's in master
23:17:34  <bnoordhuis>that's the one that #includes <windows>
23:17:41  <bnoordhuis>windows.h
23:18:14  <MI6>joyent/node: Nathan Rajlich master * 4b238b4 : Merge remote-tracking branch 'origin/v0.8' Conflicts: AUTHORS ChangeLo (+25 more commits) - http://git.io/zOfO6Q
23:18:52  <TooTallNate>kewl
23:18:53  * c4milojoined
23:28:59  * mmalecki_joined
23:30:10  * mmaleckiquit (Ping timeout: 240 seconds)
23:33:00  * c4miloquit (Remote host closed the connection)
23:35:21  <isaacs>TooTallNate: Thanks!
23:36:43  * felixgequit (Quit: felixge)
23:42:48  * ericktquit (Quit: erickt)
23:43:53  * ericktjoined