Refresh from Caucho's SVN: r7491 to r7674

8 views
Skip to first unread message

Kevin Decherf

unread,
Nov 20, 2010, 7:44:39 PM11/20/10
to querc...@googlegroups.com
Hi,

We have refreshed Quercus Git repo from Caucho's SVN (only for modules/quercus/* files) :

Reference commit: ee69b3b7476b539fb2d58ac0662535508e863884 (r7491)

List of commits:

- c39d2e97f2c29224a689b00fc2679a56c03913f0 (r7541)
  Manually applied


- efccd9f3fd36128c4070db18e5832afc947ff888 (r7551)
  REJECTED: already applied on quercus-modules repo


- c04e753a8c973b8fb9a5c75b13458ffa5d2334c5 (r7554)
  REJECTED: already applied on quercus-modules repo


- 6f28bc2ec00717c0fbd0fb150f69ead47b6c591d (r7555)
  REJECTED: already applied (issue #1)


- 552f2440ec905b2ed8ab363138291b47e493e183 (r7556)
  REJECTED: overwritten by r7583


- 2102233255d0ae41911d3aec9318c20fbb7fd0a5 (r7561)
  Manually applied


- 9bc0d8973e6f4585e326b84bfc4c95c677f34550 (r7562)
  Manually applied


- 3626d4465ce1027d6b45d821e13bc2dd302ecb2e (r7563)
  Manually applied


- 077033cbe10b0904e29aac991019f701f91c989a (r7583)

  Manually applied


- 41e87445ea70f84bbf4b793997130a647844d084 (r7588)

  Manually applied


- 889aa4a1a2d9b5a8163a093a05dd2c035d55148e (r7621)

  Manually applied


- f2d485c965ccf047b7ec2b32fd32bd676256b153 (r7622)

  Manually applied


- f9d7b54130680a8c1af27fa7ccf4ba5f9840552e (r7623)

  Manually applied


- 2c9e18e7e02903034384c63ed419efb2c1d89a23 (r7624)

  Manually applied


- 67c50d49c3ba8caa69526b47c46d1b302fad4c9a (r7625)

  REJECTED: already applied


- a221a5e8df876cbda7718c86c56047716bc872ca (r7627)

  Manually applied


- 789484148e8cd887414578ee3228c1fdafebd1d7 (r7628)

  Manually applied


- d6829ce5177cdf25cd1bcca8d8d952a71c13a8c8 (r7629)

  Manually applied


- 0ca41d8ab722a9b722790d0680d7524bc13b2895 (r7631)

  Manually applied


- 495bfb0ed7ef70292db95d823d5cb2dc0be1d542 (r7670)

  Manually applied


- dcc66642a375f21ba4b0dd90757815039bb22089 (r7674)

  Manually applied


- 63a890dacc62b22df2469e0b45f713a63ddbf58d (r7676)

  DEFERRED: planned for next refresh


- 3d93b72687ce3fef52149d36993c593b257a50d8 (r7677)

  DEFERRED: planned for next refresh



Modifications are available on the 'merge' branch and will be merged to master during the next week.


New reference commit: dcc66642a375f21ba4b0dd90757815039bb22089 (r7674)



More information about refreshing repo from Caucho's SVN: https://github.com/CleverCloud/Quercus/wiki/MergeFromCaucho


Have a nice week-end.



Kevin Decherf - M: +33 681194547
Office & Production Manager, Clever Cloud SAS

Kevin Decherf

unread,
Dec 8, 2010, 3:28:51 PM12/8/10
to querc...@googlegroups.com
Hi,

A new refresh from Caucho's SVN has been done before 4.0.11c release.

List of commits:

- 63a890dacc62b22df2469e0b45f713a63ddbf58d (r7676)

  DEFERRED: planned for next refresh


- 3d93b72687ce3fef52149d36993c593b257a50d8 (r7677)

  DEFERRED: planned for next refresh


- 26d74558c25a625f891b75526406c6404006261c (r7712)

  Manually applied


- d40eb2ed15a42be50a14b0e1f982fdb23fe50daa (r7713)

  Manually applied (replacing one of our commits)


- 5e4ffbba34333b257a9e0892e844f1889506ce46 (r7715)

  Manually applied


- b1a78929f4867f8986f1e21f2c8dbef260c425d3 (r7737)

  Manually but partially applied



New reference commit: b1a78929f4867f8986f1e21f2c8dbef260c425d3 (r7737)

Delayed commits: 63a890dacc62b22df2469e0b45f713a63ddbf58d, 3d93b72687ce3fef52149d36993c593b257a50d8



Kevin Decherf - M: +33 681194547
Office & Production Manager, Clever Cloud SAS



Reply all
Reply to author
Forward
0 new messages