public inbox for bitcoindev@googlegroups.com
 help / color / mirror / Atom feed
* [Bitcoin-development] Changes for version 0.6 are being pulled into HEAD
@ 2011-12-20 20:49 Gavin Andresen
  2011-12-21  1:46 ` Luke-Jr
  2011-12-21 10:30 ` Wladimir
  0 siblings, 2 replies; 10+ messages in thread
From: Gavin Andresen @ 2011-12-20 20:49 UTC (permalink / raw)
  To: Bitcoin Dev

FYI for anybody who doesn't hang out in IRC:

I've been busy pulling patches into git HEAD for a Bitcoin version
0.6, with the goal of having a Release Candidate 1 out in a couple of
weeks.

So if you've done all your Christmas shopping and have time to help
test, code review, etc. now would be the time.

-- 
--
Gavin Andresen



^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [Bitcoin-development] Changes for version 0.6 are being pulled into HEAD
  2011-12-20 20:49 [Bitcoin-development] Changes for version 0.6 are being pulled into HEAD Gavin Andresen
@ 2011-12-21  1:46 ` Luke-Jr
  2011-12-21 10:12   ` Mike Hearn
  2011-12-21 16:45   ` Luke-Jr
  2011-12-21 10:30 ` Wladimir
  1 sibling, 2 replies; 10+ messages in thread
From: Luke-Jr @ 2011-12-21  1:46 UTC (permalink / raw)
  To: bitcoin-development

On Tuesday, December 20, 2011 3:49:16 PM Gavin Andresen wrote:
> I've been busy pulling patches into git HEAD for a Bitcoin version
> 0.6, with the goal of having a Release Candidate 1 out in a couple of
> weeks.

I've rebuilt my 'next' and 'next-test' branches...
    git://gitorious.org/~Luke-Jr/bitcoin/luke-jr-bitcoin.git

Accepted for 0.6:
* 81807c3 Merge branch 'coinbaser' into next
* 6ea6db3 Merge remote branch 'laanwj/ui_copy_amount' into next
* a6ef83e Merge 'QR Code generation via libqrencode' into next
* e0673bd Merge branch 'signmessage_gui' into next

Ready for acceptance?
* 4783528 Merge remote branch 'matt/keepnode' into next-test
* 5a11d0f Merge branch 'force_send' into next-test
* 2cddc71 Merge remote branch 'sipa/comprpubkey' into next-test
* 73a8ca6 Merge remote branch 'matt/uri' into next-test
* 9314427 Merge remote branch 'gavin/testnetdifficulty' into next-test
* 1360e43 Merge branch 'stdint' into next-test

Needs review:
* 6ee82ff Merge branch 'forceresendtx' into next-test
* 8a82ba6 Merge branch 'blknotify' into next-test
* 674f1a6 Merge 'Temporarily disable "minimize to tray" in the startup phase
          if the "-min" option is specified' into next-test
* 5afd4de Merge branch 'bugfix_client_name' into next-test

Cannot be merged cleanly (at least not into next-test at this point):
* Pull 556 txinfo
* Pull 568 JSON-RPC multithreading + rpc_keepalive
* Pull 457 IPv6 JSON-RPC
* Pull 427 IPv6
* Pull 565 optimize_FastGetWork
* Pull 430 joelkatz optimizations
* Pull 562 optimize_ToHex
* Pull 452 JSON-RPC API versioning

Not yet written:
* Treat generation (almost) like normal receive
* JSON-RPC with integer amounts



^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [Bitcoin-development] Changes for version 0.6 are being pulled into HEAD
  2011-12-21  1:46 ` Luke-Jr
@ 2011-12-21 10:12   ` Mike Hearn
  2011-12-21 15:44     ` Luke-Jr
  2011-12-21 16:45   ` Luke-Jr
  1 sibling, 1 reply; 10+ messages in thread
From: Mike Hearn @ 2011-12-21 10:12 UTC (permalink / raw)
  To: Luke-Jr; +Cc: bitcoin-development

[-- Attachment #1: Type: text/plain, Size: 219 bytes --]

Thanks for this summary Luke.

Git does not produce very helpful summaries when every commit is a merge.
Is there a way to fix that? You have to guess what a change does based on
the name of the topic branch currently.

[-- Attachment #2: Type: text/html, Size: 248 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [Bitcoin-development] Changes for version 0.6 are being pulled into HEAD
  2011-12-20 20:49 [Bitcoin-development] Changes for version 0.6 are being pulled into HEAD Gavin Andresen
  2011-12-21  1:46 ` Luke-Jr
@ 2011-12-21 10:30 ` Wladimir
  1 sibling, 0 replies; 10+ messages in thread
From: Wladimir @ 2011-12-21 10:30 UTC (permalink / raw)
  To: Gavin Andresen; +Cc: Bitcoin Dev

[-- Attachment #1: Type: text/plain, Size: 1098 bytes --]

Woohoo, 0.6.0 merging time!

I'll merge some GUI pull requests for 0.6.x this/next week.

Wladimir

On Tue, Dec 20, 2011 at 9:49 PM, Gavin Andresen <gavinandresen@gmail.com>wrote:

> FYI for anybody who doesn't hang out in IRC:
>
> I've been busy pulling patches into git HEAD for a Bitcoin version
> 0.6, with the goal of having a Release Candidate 1 out in a couple of
> weeks.
>
> So if you've done all your Christmas shopping and have time to help
> test, code review, etc. now would be the time.
>
> --
> --
> Gavin Andresen
>
>
> ------------------------------------------------------------------------------
> Write once. Port to many.
> Get the SDK and tools to simplify cross-platform app development. Create
> new or port existing apps to sell to consumers worldwide. Explore the
> Intel AppUpSM program developer opportunity. appdeveloper.intel.com/join
> http://p.sf.net/sfu/intel-appdev
> _______________________________________________
> Bitcoin-development mailing list
> Bitcoin-development@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/bitcoin-development
>

[-- Attachment #2: Type: text/html, Size: 1780 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [Bitcoin-development] Changes for version 0.6 are being pulled into HEAD
  2011-12-21 10:12   ` Mike Hearn
@ 2011-12-21 15:44     ` Luke-Jr
  0 siblings, 0 replies; 10+ messages in thread
From: Luke-Jr @ 2011-12-21 15:44 UTC (permalink / raw)
  To: Mike Hearn; +Cc: bitcoin-development

On Wednesday, December 21, 2011 5:12:07 AM Mike Hearn wrote:
> Git does not produce very helpful summaries when every commit is a merge.
> Is there a way to fix that? You have to guess what a change does based on
> the name of the topic branch currently.

Not sure what you mean. Maybe `git log --no-merges` ?



^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [Bitcoin-development] Changes for version 0.6 are being pulled into HEAD
  2011-12-21  1:46 ` Luke-Jr
  2011-12-21 10:12   ` Mike Hearn
@ 2011-12-21 16:45   ` Luke-Jr
  2011-12-21 17:12     ` Jeff Garzik
  1 sibling, 1 reply; 10+ messages in thread
From: Luke-Jr @ 2011-12-21 16:45 UTC (permalink / raw)
  To: bitcoin-development

On Tuesday, December 20, 2011 8:46:41 PM Luke-Jr wrote:
> On Tuesday, December 20, 2011 3:49:16 PM Gavin Andresen wrote:
> > I've been busy pulling patches into git HEAD for a Bitcoin version
> > 0.6, with the goal of having a Release Candidate 1 out in a couple of
> > weeks.
> 
> I've rebuilt my 'next' and 'next-test' branches...
>     git://gitorious.org/~Luke-Jr/bitcoin/luke-jr-bitcoin.git

And here's yet another update, this time with a total of 21 branches merged. 
Anyone want to make binaries to get these branches some wider testing?

Accepted for 0.6:
* 81807c3 (pull 719) Coinbaser
* 6ea6db3 (pull 683) Context menu updates for TransactionView and...
* a6ef83e (pull 629) QR Code generation via libqrencode
* e0673bd (pull 582) Bitcoin-Qt signmessage GUI

Ready for acceptance?
* 4783528 (pull 454) Add -keepnode which attempts to -addnode and keep a...
* 5a11d0f (pull 570) Specify fees explicitly via JSON-RPC
* 2cddc71 (pull 649) Compressed pubkeys
* 73a8ca6 (pull 593) Full URL Support in bitcoin-qt
* 27a2460 (pull 721) 'getmininginfo' method
* e57ccf4 (pull 686) Testnet difficulty calculation changes, to take effect...
* 5b4a18d (pull 720) Use standard C99 (and Qt) types for 64-bit integers

Needs review:
* c7ee97d (pull 421) added option -forceresendtx
* cff2c28 (pull 714) Execute a command when best block changes...
* 3ca784f (pull 691) Temporarily disable "minimize to tray" in the startup...
* 59842f5 (pull 568) Multithreaded JSON-RPC with HTTP 1.1 Keep-Alive support
* d08e8fd (pull 565) FastGetWork optimization
* 0dc52ac (pull 715) Bugfix: comply with BIP 0014 ...
* f88dddc (pull 559) -acceptnonstdtxn option to skip "non-standard...
* 95d3e7e (pull 552) Typo-tolerant (optimized) Base58 parser
* 45beffe (pull 553) Parse URIs with non-BTC amounts
* 74439a5 (pull 562) Optimized binary-to-hex converter (ToHex)

Cannot be merged cleanly (at least not into next-test at this point):
*         (pull 430) joelkatz optimizations
*         (pull 452) JSON-RPC API versioning
*         (pull 457) IPv6 JSON-RPC
*         (pull 427) IPv6

Not yet written:
*                    Treat generation (almost) like normal receive
*                    JSON-RPC with integer amounts



^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [Bitcoin-development] Changes for version 0.6 are being pulled into HEAD
  2011-12-21 16:45   ` Luke-Jr
@ 2011-12-21 17:12     ` Jeff Garzik
  2011-12-21 17:14       ` Luke-Jr
  0 siblings, 1 reply; 10+ messages in thread
From: Jeff Garzik @ 2011-12-21 17:12 UTC (permalink / raw)
  To: Luke-Jr; +Cc: bitcoin-development

On Wed, Dec 21, 2011 at 11:45 AM, Luke-Jr <luke@dashjr.org> wrote:
> Accepted for 0.6:
> * 81807c3 (pull 719) Coinbaser

This is not "accepted" as discussed yesterday on IRC.  You need to
find buy-in from some other miners to make sure this is what "they"
want, rather than just what "you" want.

-- 
Jeff Garzik
exMULTI, Inc.
jgarzik@exmulti.com



^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [Bitcoin-development] Changes for version 0.6 are being pulled into HEAD
  2011-12-21 17:12     ` Jeff Garzik
@ 2011-12-21 17:14       ` Luke-Jr
  2011-12-21 17:17         ` Jeff Garzik
  0 siblings, 1 reply; 10+ messages in thread
From: Luke-Jr @ 2011-12-21 17:14 UTC (permalink / raw)
  To: Jeff Garzik; +Cc: bitcoin-development

On Wednesday, December 21, 2011 12:12:43 PM Jeff Garzik wrote:
> On Wed, Dec 21, 2011 at 11:45 AM, Luke-Jr <luke@dashjr.org> wrote:
> > Accepted for 0.6:
> > * 81807c3 (pull 719) Coinbaser
> 
> This is not "accepted" as discussed yesterday on IRC.  You need to
> find buy-in from some other miners to make sure this is what "they"
> want, rather than just what "you" want.

It was per Gavin on IRC before yesterday. And there is already buy-in from 
other miners.



^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [Bitcoin-development] Changes for version 0.6 are being pulled into HEAD
  2011-12-21 17:14       ` Luke-Jr
@ 2011-12-21 17:17         ` Jeff Garzik
  2011-12-21 17:37           ` Luke-Jr
  0 siblings, 1 reply; 10+ messages in thread
From: Jeff Garzik @ 2011-12-21 17:17 UTC (permalink / raw)
  To: Luke-Jr; +Cc: bitcoin-development

On Wed, Dec 21, 2011 at 12:14 PM, Luke-Jr <luke@dashjr.org> wrote:
> On Wednesday, December 21, 2011 12:12:43 PM Jeff Garzik wrote:
>> On Wed, Dec 21, 2011 at 11:45 AM, Luke-Jr <luke@dashjr.org> wrote:
>> > Accepted for 0.6:
>> > * 81807c3 (pull 719) Coinbaser
>>
>> This is not "accepted" as discussed yesterday on IRC.  You need to
>> find buy-in from some other miners to make sure this is what "they"
>> want, rather than just what "you" want.
>
> It was per Gavin on IRC before yesterday.

Quoting IRC yesterday,
<gavinandresen> jgarzik:  I defer to your judgement on coinbaser, I don't care.

> And there is already buy-in from
> other miners.

Then post data backing up that vague statement.

-- 
Jeff Garzik
exMULTI, Inc.
jgarzik@exmulti.com



^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [Bitcoin-development] Changes for version 0.6 are being pulled into HEAD
  2011-12-21 17:17         ` Jeff Garzik
@ 2011-12-21 17:37           ` Luke-Jr
  0 siblings, 0 replies; 10+ messages in thread
From: Luke-Jr @ 2011-12-21 17:37 UTC (permalink / raw)
  To: Jeff Garzik; +Cc: bitcoin-development

On Wednesday, December 21, 2011 12:17:57 PM Jeff Garzik wrote:
> On Wed, Dec 21, 2011 at 12:14 PM, Luke-Jr <luke@dashjr.org> wrote:
> > On Wednesday, December 21, 2011 12:12:43 PM Jeff Garzik wrote:
> >> On Wed, Dec 21, 2011 at 11:45 AM, Luke-Jr <luke@dashjr.org> wrote:
> >> > Accepted for 0.6:
> >> > * 81807c3 (pull 719) Coinbaser
> >> 
> >> This is not "accepted" as discussed yesterday on IRC.  You need to
> >> find buy-in from some other miners to make sure this is what "they"
> >> want, rather than just what "you" want.
> > 
> > It was per Gavin on IRC before yesterday.
> 
> Quoting IRC yesterday,
> <gavinandresen> jgarzik:  I defer to your judgement on coinbaser, I don't
> care.

[Friday, December 02, 2011] [1:57:14 PM] <gavinandresen> luke-jr: ok-- there 
seems to be general consensus to pull coinbaser for 0.6, so I'll probably pull 
it before op_eval and rework the op_eval code to use coinbaser.

> > And there is already buy-in from other miners.
> 
> Then post data backing up that vague statement.

At least Eclipse (235 GH/s) is using it, and slush (1.3 TH/s) intends to.



^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2011-12-21 17:37 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-12-20 20:49 [Bitcoin-development] Changes for version 0.6 are being pulled into HEAD Gavin Andresen
2011-12-21  1:46 ` Luke-Jr
2011-12-21 10:12   ` Mike Hearn
2011-12-21 15:44     ` Luke-Jr
2011-12-21 16:45   ` Luke-Jr
2011-12-21 17:12     ` Jeff Garzik
2011-12-21 17:14       ` Luke-Jr
2011-12-21 17:17         ` Jeff Garzik
2011-12-21 17:37           ` Luke-Jr
2011-12-21 10:30 ` Wladimir

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox