diff options
| author | Mark O'Brien <mobrien@vyatta.com> | 2008-03-19 18:38:48 -0700 |
|---|---|---|
| committer | Mark O'Brien <mobrien@vyatta.com> | 2008-03-19 18:38:48 -0700 |
| commit | 874047176e22617ff7c9c8b0c5f49b0df6810e30 (patch) | |
| tree | 232fa979db721d3c5a0f54e6a5e93298ae842d35 | |
| parent | 120bee652a7ce6fecc0951619280b67b25a21f80 (diff) | |
| parent | fadd893456b7c6dd33f4c8311b0328580b49f73c (diff) | |
| download | vyatta-cluster-874047176e22617ff7c9c8b0c5f49b0df6810e30.tar.gz vyatta-cluster-874047176e22617ff7c9c8b0c5f49b0df6810e30.zip | |
Merge branch 'glendale' of git:/git/vyatta-cluster into glendale
Conflicts:
debian/changelog
| -rw-r--r-- | debian/changelog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 4ce201f..16f56d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,7 +14,7 @@ vyatta-cluster (0.3) unstable; urgency=low [ Mark O'Brien ] - -- Mark O'Brien <mobrien@vyatta.com> Tue, 18 Mar 2008 16:59:44 -0700 + -- Mark O'Brien <mobrien@vyatta.com> Tue, 18 Mar 2008 19:04:12 -0700 vyatta-cluster (0.2) unstable; urgency=low |