Drizzle

Merge lp://qastaging/~patrick-crews/drizzle/dbqp_licenses into lp://qastaging/drizzle/7.0

  1. dbqp_licenses
  2. Merge into 7.0
Proposed by Patrick Crews
Status: Merged
Approved by: Lee Bieber
Approved revision: 2123
Merged at revision: 2123
Proposed branch: lp://qastaging/~patrick-crews/drizzle/dbqp_licenses
Merge into: lp://qastaging/drizzle/7.0
Diff against target: 390 lines (+218/-3)
15 files modified
tests/dbqp.py (+14/-0)
tests/lib/drizzle_test_run/dtr_test_execution.py (+15/-0)
tests/lib/drizzle_test_run/dtr_test_management.py (+14/-0)
tests/lib/server_mgmt/drizzled.py (+14/-0)
tests/lib/server_mgmt/server_management.py (+14/-0)
tests/lib/sys_mgmt/codeTree.py (+14/-0)
tests/lib/sys_mgmt/logging_management.py (+20/-1)
tests/lib/sys_mgmt/port_management.py (+14/-0)
tests/lib/sys_mgmt/system_management.py (+14/-0)
tests/lib/sys_mgmt/time_management.py (+15/-0)
tests/lib/test_mgmt/execution_management.py (+14/-0)
tests/lib/test_mgmt/test_execution.py (+14/-0)
tests/lib/test_mgmt/test_management.py (+14/-0)
tests/lib/test_mode.py (+14/-2)
tests/lib/test_run_options.py (+14/-0)
To merge this branch: bzr merge lp://qastaging/~patrick-crews/drizzle/dbqp_licenses
Reviewer Review Type Date Requested Status
Drizzle Developers Pending
Review via email: mp+47676@code.qastaging.launchpad.net

Description of the change

Added license text to dbqp-related files

To post a comment you must log in.
Revision history for this message
Brian Aker (brianaker) wrote :

Do you want to do version two, or the version two or better?

Revision history for this message
Patrick Crews (patrick-crews) wrote :

To be honest, I'm not certain / haven't thought too much about this.
I'm open to your thoughts if you have any recommendations

On Thu, Jan 27, 2011 at 11:30 AM, Brian Aker <email address hidden> wrote:

> Do you want to do version two, or the version two or better?
> --
>
> https://code.launchpad.net/~patrick-crews/drizzle/dbqp_licenses/+merge/47676<https://code.launchpad.net/%7Epatrick-crews/drizzle/dbqp_licenses/+merge/47676>
> You are the owner of lp:~patrick-crews/drizzle/dbqp_licenses.
>

Revision history for this message
Brian Aker (brianaker) wrote :

Any new files I have added as either version 2 or above, or as BSD. I think it would be best to keep everything under one of the two licenses.

lp://qastaging/~patrick-crews/drizzle/dbqp_licenses updated
2123. By Patrick Crews

Updated license verbiage

Revision history for this message
Patrick Crews (patrick-crews) wrote :

ACK, updated the license text with an example I found in another file:
"either version 2 of the License, or (at your option) any later version."

On Thu, Jan 27, 2011 at 2:36 PM, Brian Aker <email address hidden> wrote:

> Any new files I have added as either version 2 or above, or as BSD. I think
> it would be best to keep everything under one of the two licenses.
> --
>
> https://code.launchpad.net/~patrick-crews/drizzle/dbqp_licenses/+merge/47676<https://code.launchpad.net/%7Epatrick-crews/drizzle/dbqp_licenses/+merge/47676>
> You are the owner of lp:~patrick-crews/drizzle/dbqp_licenses.
>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches