Session Menu

Merge lp:~ted/indicator-session/ignore-annoyance into lp:indicator-session/12.10

  1. ignore-annoyance
  2. Merge into trunk.12.10
Proposed by Ted Gould
Status: Merged
Approved by: Charles Kerr
Approved revision: 364
Merged at revision: 362
Proposed branch: lp:~ted/indicator-session/ignore-annoyance
Merge into: lp:indicator-session/12.10
Diff against target: 31 lines (+16/-1)
1 file modified
.bzrignore (+16/-1)
To merge this branch: bzr merge lp:~ted/indicator-session/ignore-annoyance
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
Lars Karlitski (community) Approve
jenkins (community) continuous-integration Needs Fixing
Review via email: mp+127074@code.launchpad.net

Commit message

Add more files to be ignored

Description of the change

Pet peeve. Cleaning up the ignore file. Nothing to see here :-)

To post a comment you must log in.
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Continuous integration, rev:364
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/17/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-session-ci/./label=quantal/17/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Lars Karlitski (larsu) wrote :

Thanks!

review: Approve
Revision history for this message
Charles Kerr (charlesk) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2011-10-25 21:49:38 +0000
3+++ .bzrignore 2012-09-28 21:30:31 +0000
4@@ -50,7 +50,7 @@
5 data/indicator-session.schemas
6 src/accounts-service-client.h
7 src/accounts-service-user-client.h
8-indicator-session-[0-9].[0-9].[0-9].tar.gz
9+indicator-session-[0-9]*.[0-9]*.[0-9]*.tar.gz
10 indicator-session-[0-9].[0-9].tar.gz
11 indicator-session-[0-9].[0-9].[0-9].tar.gz.asc
12 indicator-session-[0-9].[0-9].tar.gz.asc
13@@ -241,3 +241,18 @@
14 po/tt.gmo
15 po/ur.gmo
16 po/vec.gmo
17+dbus-accounts.c
18+dbus-accounts.h
19+dbus-consolekit-manager.c
20+dbus-consolekit-manager.h
21+dbus-consolekit-seat.c
22+dbus-consolekit-seat.h
23+dbus-consolekit-session.c
24+dbus-consolekit-session.h
25+dbus-display-manager.c
26+dbus-display-manager.h
27+dbus-upower.c
28+dbus-upower.h
29+dbus-user.c
30+dbus-user.h
31+tests/test-service

Subscribers

People subscribed via source and target branches