Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 309355
b: refs/heads/master
c: 92b4ca2
h: refs/heads/master
i:
  309353: 1492c19
  309351: ac488b7
v: v3
  • Loading branch information
Lars Ellenberg authored and Philipp Reisner committed May 10, 2012
1 parent 15546e0 commit e4b743a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bc4854bc91c9a7f117437215cd8b16a0a5671d93
refs/heads/master: 92b4ca291f8676c9f323166a65fb7447774b2a46
2 changes: 1 addition & 1 deletion trunk/drivers/block/drbd/drbd_receiver.c
Original file line number Diff line number Diff line change
Expand Up @@ -2455,7 +2455,7 @@ static int drbd_uuid_compare(struct drbd_conf *mdev, int *rule_nr) __must_hold(l
mdev->p_uuid[UI_BITMAP] = mdev->p_uuid[UI_HISTORY_START];
mdev->p_uuid[UI_HISTORY_START] = mdev->p_uuid[UI_HISTORY_START + 1];

dev_info(DEV, "Did not got last syncUUID packet, corrected:\n");
dev_info(DEV, "Lost last syncUUID packet, corrected:\n");
drbd_uuid_dump(mdev, "peer", mdev->p_uuid, mdev->p_uuid[UI_SIZE], mdev->p_uuid[UI_FLAGS]);

return -1;
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/linux/drbd.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@


extern const char *drbd_buildtag(void);
#define REL_VERSION "8.3.11"
#define REL_VERSION "8.3.13"
#define API_VERSION 88
#define PRO_VERSION_MIN 86
#define PRO_VERSION_MAX 96
Expand Down

0 comments on commit e4b743a

Please sign in to comment.