The is a period in Japanese history marked by social upheaval, political intrigue and near-constant military conflict Japanese historians named after the otherwise unrelated Warring States period in China. It came to an end when all political power was unified under the Tokugawa shogunate.